From e49ecf90e565b9e49f114cadb6b24ab660cd02f3 Mon Sep 17 00:00:00 2001 From: Gaƫtan Gilbert Date: Fri, 7 Jun 2019 15:42:39 +0200 Subject: Fix #9455: avoid update_global_env when unchanged Global.universes() This also makes vernacentries correct wrt update_global_env. --- stm/stm.ml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'stm') diff --git a/stm/stm.ml b/stm/stm.ml index 1e89d6937c..6250d51fdd 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -2407,8 +2407,7 @@ let known_state ~doc ?(redefine_qed=false) ~cache id = (* State resulting from reach *) let st = Vernacstate.freeze_interp_state ~marshallable:false in ignore(stm_vernac_interp id st x) - ); - if eff then update_global_env () + ) ), eff || cache, true | `Cmd { cast = x; ceff = eff } -> (fun () -> (match !cur_opt.async_proofs_mode with @@ -2416,8 +2415,7 @@ let known_state ~doc ?(redefine_qed=false) ~cache id = resilient_command reach view.next | APoff -> reach view.next); let st = Vernacstate.freeze_interp_state ~marshallable:false in - ignore(stm_vernac_interp id st x); - if eff then update_global_env () + ignore(stm_vernac_interp id st x) ), eff || cache, true | `Fork ((x,_,_,_), None) -> (fun () -> resilient_command reach view.next; @@ -2541,8 +2539,7 @@ let known_state ~doc ?(redefine_qed=false) ~cache id = | `Sideff (ReplayCommand x,_) -> (fun () -> reach view.next; let st = Vernacstate.freeze_interp_state ~marshallable:false in - ignore(stm_vernac_interp id st x); - update_global_env () + ignore(stm_vernac_interp id st x) ), cache, true | `Sideff (CherryPickEnv, origin) -> (fun () -> reach view.next; -- cgit v1.2.3