diff options
| author | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2011-07-16 16:17:08 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2011-07-16 16:17:08 +0000 |
| commit | a335e621aaa85a7f73b16c121261dbecf8e68340 (patch) | |
| tree | 31312a22aafc7f66818c0c82f4c96e88ff391595 /cfrontend/Cshmgen.v | |
| parent | 93b89122000e42ac57abc39734fdf05d3a89e83c (diff) | |
| download | compcert-kvx-a335e621aaa85a7f73b16c121261dbecf8e68340.tar.gz compcert-kvx-a335e621aaa85a7f73b16c121261dbecf8e68340.zip | |
In conditional expressions e1 ? e2 : e3, cast the results of e2 and e3 to the type of the whole conditional expression.
Replaced predicates "cast", "is_true" and "is_false" by functions "sem_cast" and "bool_val".
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1684 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'cfrontend/Cshmgen.v')
| -rw-r--r-- | cfrontend/Cshmgen.v | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cfrontend/Cshmgen.v b/cfrontend/Cshmgen.v index cc243163..e32001b9 100644 --- a/cfrontend/Cshmgen.v +++ b/cfrontend/Cshmgen.v @@ -355,11 +355,13 @@ Fixpoint transl_expr (a: Clight.expr) {struct a} : res expr := | Clight.Ecast b ty => do tb <- transl_expr b; OK (make_cast (typeof b) ty tb) - | Clight.Econdition b c d _ => + | Clight.Econdition b c d ty => do tb <- transl_expr b; do tc <- transl_expr c; do td <- transl_expr d; - OK(Econdition (make_boolean tb (typeof b)) tc td) + OK(Econdition (make_boolean tb (typeof b)) + (make_cast (typeof c) ty tc) + (make_cast (typeof d) ty td)) | Clight.Esizeof ty _ => OK(make_intconst (Int.repr (Csyntax.sizeof ty))) | Clight.Efield b i ty => |