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 +++------
 vernac/vernacentries.ml | 5 ++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

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;
diff --git a/vernac/vernacentries.ml b/vernac/vernacentries.ml
index d206165e88..d52fe480ef 100644
--- a/vernac/vernacentries.ml
+++ b/vernac/vernacentries.ml
@@ -2755,7 +2755,10 @@ and vernac_load ~verbosely ~st fname =
 
 and interp_control ?proof ~st v = match v with
   | { v=VernacExpr (atts, cmd) } ->
-    interp_expr ?proof ~atts ~st cmd
+    let before_univs = Global.universes () in
+    let pstack = interp_expr ?proof ~atts ~st cmd in
+    if before_univs == Global.universes () then pstack
+    else Option.map (Lemmas.Stack.map_top_pstate ~f:Proof_global.update_global_env) pstack
   | { v=VernacFail v } ->
     with_fail ~st (fun () -> interp_control ?proof ~st v);
     st.Vernacstate.lemmas
-- 
cgit v1.2.3