diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-04-02 16:25:25 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-04-02 16:25:25 +0200 |
| commit | 170284b51766112e29d6bbfe519bad9f6da95269 (patch) | |
| tree | 13a163ccee48cee0512a8af484b394623cdce030 /cfrontend/ClightBigstep.v | |
| parent | 2e30ad9698a6f24a8a746f68b30c235913006392 (diff) | |
| parent | 959432fa13a899290db5236f93575a8bfdc13bb5 (diff) | |
| download | compcert-kvx-170284b51766112e29d6bbfe519bad9f6da95269.tar.gz compcert-kvx-170284b51766112e29d6bbfe519bad9f6da95269.zip | |
Merge branch 'master' into dwarf
Diffstat (limited to 'cfrontend/ClightBigstep.v')
| -rw-r--r-- | cfrontend/ClightBigstep.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cfrontend/ClightBigstep.v b/cfrontend/ClightBigstep.v index 5b092db7..ac8931e5 100644 --- a/cfrontend/ClightBigstep.v +++ b/cfrontend/ClightBigstep.v @@ -115,7 +115,7 @@ Inductive exec_stmt: env -> temp_env -> mem -> statement -> trace -> temp_env -> t1 le1 m1 out | exec_Sifthenelse: forall e le m a s1 s2 v1 b t le' m' out, eval_expr ge e le m a v1 -> - bool_val v1 (typeof a) = Some b -> + bool_val v1 (typeof a) m = Some b -> exec_stmt e le m (if b then s1 else s2) t le' m' out -> exec_stmt e le m (Sifthenelse a s1 s2) t le' m' out @@ -204,7 +204,7 @@ CoInductive execinf_stmt: env -> temp_env -> mem -> statement -> traceinf -> Pro execinf_stmt e le m (Ssequence s1 s2) (t1 *** t2) | execinf_Sifthenelse: forall e le m a s1 s2 v1 b t, eval_expr ge e le m a v1 -> - bool_val v1 (typeof a) = Some b -> + bool_val v1 (typeof a) m = Some b -> execinf_stmt e le m (if b then s1 else s2) t -> execinf_stmt e le m (Sifthenelse a s1 s2) t | execinf_Sloop_body1: forall e le m s1 s2 t, |