diff options
| author | Bernhard Schommer <bschommer@users.noreply.github.com> | 2018-08-20 11:16:42 +0200 |
|---|---|---|
| committer | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2018-08-20 11:16:42 +0200 |
| commit | 778d0cc5f87472f2da267be8356e5aef7fb75f96 (patch) | |
| tree | f73e4af31380008c555512497a12ac9ec67398e8 /cparser/Cutil.ml | |
| parent | 939977c7142222d0ec0b67322b06daa187a7b829 (diff) | |
| download | compcert-kvx-778d0cc5f87472f2da267be8356e5aef7fb75f96.tar.gz compcert-kvx-778d0cc5f87472f2da267be8356e5aef7fb75f96.zip | |
Improve support and diagnostic for type qualified arrays (#118)
* Add diagnostic for type qualified arrays that occur in the wrong place
Arrays with type qualifiers (e.g. int t[const 5]) are only allowed as
function parameters and for them
only the outermost array type derivation.
Bug 23400
* Keep attributes from array for argument conversion
Type qualifiers of arrays in function parameters are just syntactic sugar
to allow adding them to the resulting pointer type. Hence, when a
qualified array type such as `int t[const 5]` decays into a pointer type
during argument conversion, the pointer type should be qualified, e.g. `int * const t`.
Diffstat (limited to 'cparser/Cutil.ml')
| -rw-r--r-- | cparser/Cutil.ml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cparser/Cutil.ml b/cparser/Cutil.ml index dcafbea4..e25a1d84 100644 --- a/cparser/Cutil.ml +++ b/cparser/Cutil.ml @@ -824,6 +824,15 @@ let float_rank = function | FDouble -> 2 | FLongDouble -> 3 +(* Test for qualified array types *) + +let rec is_qualified_array = function + | TArray (ty, _, attr) -> + List.exists attr_is_standard attr || is_qualified_array ty + | TPtr (ty, _) -> is_qualified_array ty + | TFun(ty_ret, _, _, _) -> is_qualified_array ty_ret + | _ -> false + (* Array and function types "decay" to pointer types in many cases *) let pointer_decay env t = @@ -901,7 +910,7 @@ let argument_conversion env t = (* Arrays and functions degrade automatically to pointers *) (* Other types are not changed *) match unroll env t with - | TArray(ty, _, _) -> TPtr(ty, []) + | TArray(ty, _, attr) -> TPtr(ty, attr) | TFun _ as ty -> TPtr(ty, []) | _ -> t (* preserve typedefs *) |