diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2016-07-11 08:30:14 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2016-07-11 08:30:14 +0200 |
| commit | d5b86a98560c36fbcb3ab8d2698e09147acda512 (patch) | |
| tree | f3ab850a1620fa5d3dbbe439998d09de8e0d817d /cfrontend | |
| parent | ea2d6b70ed06c60dba9ba81cf53883c85fb92068 (diff) | |
| parent | 3872ce9f9806d9af334b1fde092145edf664d170 (diff) | |
| download | compcert-d5b86a98560c36fbcb3ab8d2698e09147acda512.tar.gz compcert-d5b86a98560c36fbcb3ab8d2698e09147acda512.zip | |
Merge branch 'master' into add-file
Diffstat (limited to 'cfrontend')
| -rw-r--r-- | cfrontend/Cstrategy.v | 2 | ||||
| -rw-r--r-- | cfrontend/SimplLocalsproof.v | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cfrontend/Cstrategy.v b/cfrontend/Cstrategy.v index 2650e0a8..6b2924e4 100644 --- a/cfrontend/Cstrategy.v +++ b/cfrontend/Cstrategy.v @@ -743,7 +743,7 @@ Ltac FinishL := apply star_one; left; apply step_lred; eauto; simpl; try (econst (* var local *) FinishL. (* var global *) - FinishL. apply red_var_global; auto. + FinishL. (* deref *) Steps H0 (fun x => C(Ederef x ty)). FinishL. (* field struct *) diff --git a/cfrontend/SimplLocalsproof.v b/cfrontend/SimplLocalsproof.v index 2cd82d8f..48a7a773 100644 --- a/cfrontend/SimplLocalsproof.v +++ b/cfrontend/SimplLocalsproof.v @@ -2291,4 +2291,3 @@ Local Transparent Linker_fundef. type_eq t0 t2 && calling_convention_eq c c0); inv H2. econstructor; split; eauto. Qed. - |