From 05a5825ee55227327ba1b09a548e3b9ba876d0cf Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Wed, 22 Apr 2020 08:53:06 +0200 Subject: use cbn in T instead of simpl in T --- driver/Compiler.vexpand | 3 ++- tools/compiler_expand.ml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/driver/Compiler.vexpand b/driver/Compiler.vexpand index 17b504b7..1e671464 100644 --- a/driver/Compiler.vexpand +++ b/driver/Compiler.vexpand @@ -217,7 +217,8 @@ Proof. unfold transf_cminor_program, time in T. rewrite ! compose_print_identity in T. simpl in T. destruct (Selection.sel_program p4) as [p5|e] eqn:P5; simpl in T; try discriminate. destruct (RTLgen.transl_program p5) as [p6|e] eqn:P6; simpl in T; try discriminate. - unfold transf_rtl_program, time in T. rewrite ! compose_print_identity in T. simpl in T. + unfold transf_rtl_program, time in T. rewrite ! compose_print_identity in T. + cbn in T. EXPAND_RTL_PROOF unfold match_prog; simpl. exists p1; split. apply SimplExprproof.transf_program_match; auto. diff --git a/tools/compiler_expand.ml b/tools/compiler_expand.ml index 1555d75b..4fc746f0 100644 --- a/tools/compiler_expand.ml +++ b/tools/compiler_expand.ml @@ -99,7 +99,7 @@ let print_rtl_proof oc = Printf.fprintf oc "set (p%d := %a%s.transf_program p%d) in *.\n" j (print_if "total") trigger pass_name (pred j) | PARTIAL -> - Printf.fprintf oc "destruct (%a%s.transf_program p%d) as [p%d|e] eqn:P%d; simpl in T; try discriminate.\n" + Printf.fprintf oc "destruct (%a%s.transf_program p%d) as [p%d|e] eqn:P%d; cbn in T; try discriminate.\n" (print_if "partial") trigger pass_name (pred j) j j) all_passes;; -- cgit