diff options
| author | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2013-06-16 06:56:02 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2013-06-16 06:56:02 +0000 |
| commit | b40e056328e183522b50c68aefdbff057bca29cc (patch) | |
| tree | b05fd2f0490e979e68ea06e1931bfcfba9b35771 /backend/Inliningspec.v | |
| parent | 0648e79b98cc8d79e1942d15dbf05ba7b9eaaa8c (diff) | |
| download | compcert-kvx-b40e056328e183522b50c68aefdbff057bca29cc.tar.gz compcert-kvx-b40e056328e183522b50c68aefdbff057bca29cc.zip | |
Merge of the "princeton" branch:
- Define type "block" as "positive" instead of "Z".
- Strengthen mem_unchanged_on so that the permissions are identical,
instead of possibly increasing.
- Move mem_unchanged_on from Events to Memory.Mem.
- Define it in terms of mem_contents rather than in terms of Mem.load.
- ExportClight: try to name temporaries introduced by SimplExpr
- SimplExpr: avoid reusing temporaries between different functions,
instead, thread a single generator through all functions.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2276 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'backend/Inliningspec.v')
| -rw-r--r-- | backend/Inliningspec.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/Inliningspec.v b/backend/Inliningspec.v index e8dba674..f41f3764 100644 --- a/backend/Inliningspec.v +++ b/backend/Inliningspec.v @@ -46,17 +46,17 @@ Proof. (* same *) subst id0. inv H1. destruct gd. destruct f0. destruct (should_inline id f0). - rewrite PTree.gss in H0. rewrite ZMap.gss. inv H0; auto. + rewrite PTree.gss in H0. rewrite PTree.gss. inv H0; auto. rewrite PTree.grs in H0; discriminate. rewrite PTree.grs in H0; discriminate. rewrite PTree.grs in H0; discriminate. (* different *) - destruct gd. rewrite ZMap.gso. eapply H; eauto. + destruct gd. rewrite PTree.gso. eapply H; eauto. destruct f0. destruct (should_inline id f0). rewrite PTree.gso in H0; auto. rewrite PTree.gro in H0; auto. rewrite PTree.gro in H0; auto. - exploit Genv.genv_symb_range; eauto. intros [A B]. unfold ZIndexed.t; omega. + red; intros; subst b. eelim Plt_strict. eapply Genv.genv_symb_range; eauto. rewrite PTree.gro in H0; auto. eapply H; eauto. Qed. |