diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-05-21 16:34:06 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-05-21 16:34:06 +0200 |
| commit | 606afe8cc8def940f991d07b8f6adb6bae7ce691 (patch) | |
| tree | 29fe6749b270761087514b75ef7116b936398101 /cfrontend/C2C.ml | |
| parent | 50ed2827867238a98f2036f799d4d6f354a2581c (diff) | |
| parent | b686f8df572ea77c8832637bed4e4cd81f0931e2 (diff) | |
| download | compcert-606afe8cc8def940f991d07b8f6adb6bae7ce691.tar.gz compcert-606afe8cc8def940f991d07b8f6adb6bae7ce691.zip | |
Merge branch 'master' into json_export
Diffstat (limited to 'cfrontend/C2C.ml')
| -rw-r--r-- | cfrontend/C2C.ml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cfrontend/C2C.ml b/cfrontend/C2C.ml index 6ecdb14e..a0e6b259 100644 --- a/cfrontend/C2C.ml +++ b/cfrontend/C2C.ml @@ -626,7 +626,6 @@ let ewrap = function error ("retyping error: " ^ string_of_errmsg msg); ezero let rec convertExpr env e = - (*let ty = convertTyp env e.etyp in*) match e.edesc with | C.EVar _ | C.EUnop((C.Oderef|C.Odot _|C.Oarrow _), _) @@ -734,9 +733,8 @@ let rec convertExpr env e = ewrap (Ctyping.eseqor (convertExpr env e1) (convertExpr env e2)) | C.EConditional(e1, e2, e3) -> - ewrap (Ctyping.econdition' (convertExpr env e1) - (convertExpr env e2) (convertExpr env e3) - (convertTyp env e.etyp)) + ewrap (Ctyping.econdition (convertExpr env e1) + (convertExpr env e2) (convertExpr env e3)) | C.ECast(ty1, e1) -> ewrap (Ctyping.ecast (convertTyp env ty1) (convertExpr env e1)) | C.ECompound(ty1, ie) -> |