diff options
author | Yann Herklotz <git@yannherklotz.com> | 2021-09-17 16:52:29 +0100 |
---|---|---|
committer | Yann Herklotz <git@yannherklotz.com> | 2021-09-17 16:52:29 +0100 |
commit | 4be142376801c205ffd701208fad8eedf2c08d90 (patch) | |
tree | d2f4d54cc34319e380e349eddef61c2994202e8b /backend/Cminor.v | |
parent | 48a9dcbdc968bcf05b4eec17b8c7fd471fb80240 (diff) | |
parent | c9fad7cd7bdc4e79fb06a1d39abfa0d5471623e5 (diff) | |
download | compcert-4be142376801c205ffd701208fad8eedf2c08d90.tar.gz compcert-4be142376801c205ffd701208fad8eedf2c08d90.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'backend/Cminor.v')
-rw-r--r-- | backend/Cminor.v | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/backend/Cminor.v b/backend/Cminor.v index 91a4c104..1618866e 100644 --- a/backend/Cminor.v +++ b/backend/Cminor.v @@ -6,10 +6,11 @@ (* *) (* Copyright Institut National de Recherche en Informatique et en *) (* Automatique. All rights reserved. This file is distributed *) -(* under the terms of the GNU General Public License as published by *) -(* the Free Software Foundation, either version 2 of the License, or *) -(* (at your option) any later version. This file is also distributed *) -(* under the terms of the INRIA Non-Commercial License Agreement. *) +(* under the terms of the GNU Lesser General Public License as *) +(* published by the Free Software Foundation, either version 2.1 of *) +(* the License, or (at your option) any later version. *) +(* This file is also distributed under the terms of the *) +(* INRIA Non-Commercial License Agreement. *) (* *) (* *********************************************************************) @@ -588,7 +589,7 @@ Proof. exploit external_call_receptive; eauto. intros [vres2 [m2 EC2]]. exists (Returnstate vres2 k m2). econstructor; eauto. (* trace length *) - red; intros; inv H; simpl; try omega; eapply external_call_trace_length; eauto. + red; intros; inv H; simpl; try lia; eapply external_call_trace_length; eauto. Qed. (** This semantics is determinate. *) @@ -645,7 +646,7 @@ Proof. intros (A & B). split; intros; auto. apply B in H; destruct H; congruence. - (* single event *) - red; simpl. destruct 1; simpl; try omega; + red; simpl. destruct 1; simpl; try lia; eapply external_call_trace_length; eauto. - (* initial states *) inv H; inv H0. unfold ge0, ge1 in *. congruence. |