diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-01-23 13:33:33 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-01-23 13:33:33 +0100 |
| commit | b5b681b7b55abb18165eaa907b04aefb9b0fddde (patch) | |
| tree | 9c0a7df4b20ede85b54fe5c4e5d326fbf30a0013 /backend/Constpropproof.v | |
| parent | 12803784f2753863985d1030999469c18e01e0f1 (diff) | |
| parent | f00b70b6a17fdfb4e8606df891f6becc8102ef12 (diff) | |
| download | compcert-b5b681b7b55abb18165eaa907b04aefb9b0fddde.tar.gz compcert-b5b681b7b55abb18165eaa907b04aefb9b0fddde.zip | |
Merge branch 'master' into dwarf
Diffstat (limited to 'backend/Constpropproof.v')
| -rw-r--r-- | backend/Constpropproof.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/Constpropproof.v b/backend/Constpropproof.v index 98e6e577..450050de 100644 --- a/backend/Constpropproof.v +++ b/backend/Constpropproof.v @@ -277,11 +277,11 @@ Proof. + simpl in H. assert (V: vmatch bc (rs#r1) (Ptr (Gl symb n1))) by (rewrite <- e1; apply MATCH). exploit vmatch_ptr_gl'; eauto. intros [A | [b [A B]]]. * simpl in H; rewrite A in H; inv H. - * simpl; rewrite volatile_load_global_charact. exists b; split; congruence. + * simpl; rewrite volatile_load_global_charact; simpl. exists b; split; congruence. + simpl in H. assert (V: vmatch bc (rs#r1) (Ptr (Gl symb n1))) by (rewrite <- e1; apply MATCH). exploit vmatch_ptr_gl'; eauto. intros [A | [b [A B]]]. * simpl in H; rewrite A in H; inv H. - * simpl; rewrite volatile_store_global_charact. exists b; split; congruence. + * simpl; rewrite volatile_store_global_charact; simpl. exists b; split; congruence. + inv H. exploit annot_strength_reduction_correct; eauto. intros [eargs' [A B]]. rewrite <- B. econstructor; eauto. Qed. |