aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
context:
space:
mode:
authorLéo Gourdin <leo.gourdin@univ-grenoble-alpes.fr>2021-05-28 12:38:05 +0200
committerLéo Gourdin <leo.gourdin@univ-grenoble-alpes.fr>2021-05-28 12:38:05 +0200
commit8752cea89f862d92d49183fe10d1918588143ab1 (patch)
tree2e947a22395702b741c8fac14c7d89ac419c4b5b /driver
parentef5775ea869701eb04c873174c362b314166bf06 (diff)
downloadcompcert-kvx-8752cea89f862d92d49183fe10d1918588143ab1.tar.gz
compcert-kvx-8752cea89f862d92d49183fe10d1918588143ab1.zip
fix some merge errors
Diffstat (limited to 'driver')
-rw-r--r--driver/Compiler.vexpand2
1 files changed, 1 insertions, 1 deletions
diff --git a/driver/Compiler.vexpand b/driver/Compiler.vexpand
index 40ea0d68..85f265db 100644
--- a/driver/Compiler.vexpand
+++ b/driver/Compiler.vexpand
@@ -300,7 +300,7 @@ EXPAND_RTL_FORWARD_SIMULATIONS
eapply compose_forward_simulations.
eapply RTLtoBTLproof.transf_program_correct; eassumption.
eapply compose_forward_simulations.
- eapply BTLtoRTLproof.transf_program_correct; eassumption.
+ eapply BTLtoRTLproof.transf_program_correct_cfg; eassumption.
eapply compose_forward_simulations.
eapply Allocationproof.transf_program_correct; eassumption.
eapply compose_forward_simulations.