diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2018-05-24 20:07:43 +0200 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2018-05-24 20:10:26 +0200 |
| commit | 3de896cebebbdb35d179d17133ee53e505b1f0a8 (patch) | |
| tree | fd019905eb4d52d073b3899cc607caaef378309a /cparser/Ceval.ml | |
| parent | ca26f4513b62f94c13a1bbc487014e306a5a8ebe (diff) | |
| download | compcert-kvx-3de896cebebbdb35d179d17133ee53e505b1f0a8.tar.gz compcert-kvx-3de896cebebbdb35d179d17133ee53e505b1f0a8.zip | |
Reject "e1, e2" as a compile-time constant expression
This is what ISO C99 says, even though C++ and some C compilers accept it.
Diffstat (limited to 'cparser/Ceval.ml')
| -rw-r--r-- | cparser/Ceval.ml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cparser/Ceval.ml b/cparser/Ceval.ml index f479ad5c..6247254f 100644 --- a/cparser/Ceval.ml +++ b/cparser/Ceval.ml @@ -217,8 +217,6 @@ let binop env op tyop tyres ty1 v1 ty2 v2 = comparison env (<=) None tyop v1 v2 | Oge -> comparison env (>=) None tyop v1 v2 - | Ocomma -> - v2 | Ologand -> if boolean_value v1 then if boolean_value v2 then I 1L else I 0L @@ -315,10 +313,8 @@ and is_constant_expr env e = | Oadd | Osub | Omul | Odiv | Omod | Oand | Oor | Oxor | Oshl | Oshr | Oeq | One | Olt | Ogt | Ole | Oge - | Ocomma | Ologand | Ologor -> + | Ologand | Ologor -> is_constant_expr env e1 && is_constant_expr env e2 - (* ISO C99 says that constant expressions shall not contain comma - operators. However, clang accepts them, and they are harmless. *) | Oindex -> is_constant_rval_of_lval env e | Oassign @@ -326,6 +322,10 @@ and is_constant_expr env e = | Oand_assign | Oor_assign | Oxor_assign | Oshl_assign | Oshr_assign -> false (* constant expressions shall not contain assignments *) + | Ocomma -> + false + (* some C compilers accept "e1, e2" as a constant expression. + But this is not standard ISO C. *) end | EConditional(e1, e2, e3) -> is_constant_expr env e1 && is_constant_expr env e2 |