diff options
author | Léo Gourdin <leo.gourdin@univ-grenoble-alpes.fr> | 2021-05-28 12:38:05 +0200 |
---|---|---|
committer | Léo Gourdin <leo.gourdin@univ-grenoble-alpes.fr> | 2021-05-28 12:38:05 +0200 |
commit | 8752cea89f862d92d49183fe10d1918588143ab1 (patch) | |
tree | 2e947a22395702b741c8fac14c7d89ac419c4b5b /scheduling/RTLtoBTLproof.v | |
parent | ef5775ea869701eb04c873174c362b314166bf06 (diff) | |
download | compcert-kvx-8752cea89f862d92d49183fe10d1918588143ab1.tar.gz compcert-kvx-8752cea89f862d92d49183fe10d1918588143ab1.zip |
fix some merge errors
Diffstat (limited to 'scheduling/RTLtoBTLproof.v')
-rw-r--r-- | scheduling/RTLtoBTLproof.v | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scheduling/RTLtoBTLproof.v b/scheduling/RTLtoBTLproof.v index 7d83931b..f2f99ef5 100644 --- a/scheduling/RTLtoBTLproof.v +++ b/scheduling/RTLtoBTLproof.v @@ -554,6 +554,7 @@ Proof. eexists; left; eexists; split; eauto. repeat econstructor; eauto. apply iblock_istep_run_equiv in BTL_RUN; eauto. + econstructor. - (* Others *) exists (Some ib2); right; split. simpl; auto. |