diff options
| author | David Monniaux <David.Monniaux@univ-grenoble-alpes.fr> | 2021-09-24 14:51:15 +0200 |
|---|---|---|
| committer | David Monniaux <David.Monniaux@univ-grenoble-alpes.fr> | 2021-09-24 14:51:15 +0200 |
| commit | e49318b3606d7568d8592887e4278efa696afd10 (patch) | |
| tree | 99a9a1b883e1db3a4f56e1b5046453817827ceef /cfrontend/Csyntax.v | |
| parent | 2789e6179af061381f5b18a268adb562b28bcb8e (diff) | |
| parent | c34d25e011402aedad62b3fe9b7b04989df4522e (diff) | |
| download | compcert-kvx-e49318b3606d7568d8592887e4278efa696afd10.tar.gz compcert-kvx-e49318b3606d7568d8592887e4278efa696afd10.zip | |
Merge branch 'master' of https://github.com/AbsInt/CompCert into towards_3.10
Diffstat (limited to 'cfrontend/Csyntax.v')
| -rw-r--r-- | cfrontend/Csyntax.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cfrontend/Csyntax.v b/cfrontend/Csyntax.v index 19bc2ec3..5b8a62be 100644 --- a/cfrontend/Csyntax.v +++ b/cfrontend/Csyntax.v @@ -56,7 +56,7 @@ Inductive expr : Type := (**r function call [r1(rargs)] *) | Ebuiltin (ef: external_function) (tyargs: typelist) (rargs: exprlist) (ty: type) (**r builtin function call *) - | Eloc (b: block) (ofs: ptrofs) (ty: type) + | Eloc (b: block) (ofs: ptrofs) (bf: bitfield) (ty: type) (**r memory location, result of evaluating a l-value *) | Eparen (r: expr) (tycast: type) (ty: type) (**r marked subexpression *) @@ -117,7 +117,7 @@ Definition Eselection (r1 r2 r3: expr) (ty: type) := Definition typeof (a: expr) : type := match a with - | Eloc _ _ ty => ty + | Eloc _ _ _ ty => ty | Evar _ ty => ty | Ederef _ ty => ty | Efield _ _ ty => ty |