diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-02-19 16:24:28 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-02-19 16:24:28 +0100 |
| commit | e51ffb6c1d9411515facc5e97a4e8dba5d8b55ab (patch) | |
| tree | 80a7fc8212d28712365082e1a2a2d0fa28cedad3 /cparser/PackedStructs.ml | |
| parent | c130f4936bad11fd6dab3a5d142b870d2a5f650c (diff) | |
| parent | b0eb1dfc9fd7b15c556c49101390d882b0f00f8a (diff) | |
| download | compcert-e51ffb6c1d9411515facc5e97a4e8dba5d8b55ab.tar.gz compcert-e51ffb6c1d9411515facc5e97a4e8dba5d8b55ab.zip | |
Merge branch 'master' into no-shell
Diffstat (limited to 'cparser/PackedStructs.ml')
| -rw-r--r-- | cparser/PackedStructs.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cparser/PackedStructs.ml b/cparser/PackedStructs.ml index 3064e78d..1f602fc1 100644 --- a/cparser/PackedStructs.ml +++ b/cparser/PackedStructs.ml @@ -138,7 +138,7 @@ let accessor_type loc env ty = match unroll env ty with | TInt(ik,_) -> (8 * sizeof_ikind ik, TInt(unsigned_ikind_of ik,[])) | TEnum(_,_) -> (8 * sizeof_ikind enum_ikind, TInt(unsigned_ikind_of enum_ikind,[])) - | TPtr _ -> (8 * !config.sizeof_ptr, TInt(ptr_t_ikind,[])) + | TPtr _ -> (8 * !config.sizeof_ptr, TInt(ptr_t_ikind(),[])) | _ -> error "%a: unsupported type for byte-swapped field access" formatloc loc; (32, TVoid []) @@ -147,7 +147,7 @@ let accessor_type loc env ty = let ecast ty e = {edesc = ECast(ty, e); etyp = ty} let ecast_opt env ty e = - if compatible_types ~noattrs:true env ty e.etyp then e else ecast ty e + if compatible_types AttrCompat env ty e.etyp then e else ecast ty e (* (ty) __builtin_readNN_reversed(&lval) or (ty) __builtin_bswapNN(lval) *) |