aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Dénès <mail@maximedenes.fr>2016-09-21 13:40:26 +0200
committerMaxime Dénès <mail@maximedenes.fr>2017-01-09 14:58:03 +0100
commite61eb63a62560929b6b9856b29ba8557ab8dc53d (patch)
tree656d3317141e683c44f3dfa2276cfe4a30b4bd0c
parent747ad5bd8c364684256fc7dd306cd475401fe1b0 (diff)
downloadcompcert-kvx-e61eb63a62560929b6b9856b29ba8557ab8dc53d.tar.gz
compcert-kvx-e61eb63a62560929b6b9856b29ba8557ab8dc53d.zip
The subst tactic has become more powerful.
-rw-r--r--backend/Inliningproof.v4
-rw-r--r--backend/Unusedglobproof.v2
-rw-r--r--cfrontend/Ctypes.v2
3 files changed, 4 insertions, 4 deletions
diff --git a/backend/Inliningproof.v b/backend/Inliningproof.v
index d06fa997..d5d7e033 100644
--- a/backend/Inliningproof.v
+++ b/backend/Inliningproof.v
@@ -1171,11 +1171,11 @@ Proof.
rewrite <- SP in MS0.
eapply match_stacks_invariant; eauto.
intros. destruct (eq_block b1 stk).
- subst b1. rewrite D in H8; inv H8. subst b2. eelim Plt_strict; eauto.
+ subst b1. rewrite D in H8; inv H8. eelim Plt_strict; eauto.
rewrite E in H8; auto.
intros. exploit Mem.perm_alloc_inv. eexact H. eauto.
destruct (eq_block b1 stk); intros; auto.
- subst b1. rewrite D in H8; inv H8. subst b2. eelim Plt_strict; eauto.
+ subst b1. rewrite D in H8; inv H8. eelim Plt_strict; eauto.
intros. eapply Mem.perm_alloc_1; eauto.
intros. exploit Mem.perm_alloc_inv. eexact A. eauto.
rewrite dec_eq_false; auto.
diff --git a/backend/Unusedglobproof.v b/backend/Unusedglobproof.v
index 7e9c3ca0..c79ae4fd 100644
--- a/backend/Unusedglobproof.v
+++ b/backend/Unusedglobproof.v
@@ -1015,7 +1015,7 @@ Proof.
{ rewrite STK, TSTK.
apply match_stacks_incr with j; auto.
intros. destruct (eq_block b1 stk).
- subst b1. rewrite F in H1; inv H1. subst b2. split; apply Ple_refl.
+ subst b1. rewrite F in H1; inv H1. split; apply Ple_refl.
rewrite G in H1 by auto. congruence. }
econstructor; split.
eapply exec_function_internal; eauto.
diff --git a/cfrontend/Ctypes.v b/cfrontend/Ctypes.v
index 0794743d..7b689674 100644
--- a/cfrontend/Ctypes.v
+++ b/cfrontend/Ctypes.v
@@ -1519,7 +1519,7 @@ Local Transparent Linker_program.
- intros. exploit link_match_fundef; eauto. intros (tf & A & B). exists tf; auto.
- intros.
Local Transparent Linker_types.
- simpl in *. destruct (type_eq v1 v2); inv H4. subst v tv2. exists tv1; rewrite dec_eq_true; auto.
+ simpl in *. destruct (type_eq v1 v2); inv H4. exists v; rewrite dec_eq_true; auto.
- eauto.
- eauto.
- eauto.