From 6bcdfa87a71c00a12a918a0f6e7dad814b6a087a Mon Sep 17 00:00:00 2001
From: Kartik Agaram <vc@akkartik.com>
Date: Sun, 3 Mar 2019 08:20:15 -0800
Subject: 4993

Fix CI after commit 4987. And track stack depths more correctly inside
sandboxes.
---
 101run_sandboxed.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to '101run_sandboxed.cc')

diff --git a/101run_sandboxed.cc b/101run_sandboxed.cc
index 5a9db896..f054cd8b 100644
--- a/101run_sandboxed.cc
+++ b/101run_sandboxed.cc
@@ -150,9 +150,6 @@ map<string, type_tree*> Type_abbreviations_snapshot_stash;
 vector<scenario> Scenarios_snapshot_stash;
 set<string> Scenario_names_snapshot_stash;
 
-:(before "End Types")  //: include in all cleaved compilation units
-const int App_depth = 1;  // where all Mu code will trace to by default
-
 :(code)
 void run_code_begin(bool should_stash_snapshots) {
   // stuff to undo later, in run_code_end()
@@ -164,6 +161,7 @@ void run_code_begin(bool should_stash_snapshots) {
     stash_snapshots();
   Save_trace_stream = Trace_stream;
   Save_callstack_depth = Callstack_depth;
+  Callstack_depth = Initial_callstack_depth;
   Trace_stream = new trace_stream;
   Trace_stream->collect_depth = App_depth;
 }
@@ -178,6 +176,7 @@ void run_code_end() {
 //?   fout.close();
   delete Trace_stream;
   Trace_stream = Save_trace_stream;
+  Callstack_depth = Save_callstack_depth;
   Save_trace_stream = NULL;
   Save_trace_file.clear();
   Save_callstack_depth = 0;
-- 
cgit 1.4.1-2-gfad0