diff options
| author | Emilio Jesus Gallego Arias | 2019-07-03 13:02:55 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2019-07-03 13:02:55 +0200 |
| commit | 465ee008d15bb1fb0428aef513b8c3fd3456327a (patch) | |
| tree | dfc870d1a5d7b6d50adbd25e805f9521143a10a0 /stm | |
| parent | 60a13c4f6f9ce211a4078634e66d5eae49035ccc (diff) | |
| parent | e49ecf90e565b9e49f114cadb6b24ab660cd02f3 (diff) | |
Merge PR #10338: Fix #9455: avoid update_global_env when unchanged Global.universes()
Ack-by: SkySkimmer
Reviewed-by: ejgallego
Ack-by: gares
Diffstat (limited to 'stm')
| -rw-r--r-- | stm/stm.ml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/stm/stm.ml b/stm/stm.ml index e04277b052..ceb62582cd 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -2423,8 +2423,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 @@ -2432,8 +2431,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; @@ -2562,8 +2560,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; |
