src/Debug.cc

@@ -25,6 +25,7 @@
 #include "zeek/IntrusivePtr.h"
 #include "zeek/PolicyFile.h"
 #include "zeek/Reporter.h"
+#include "zeek/RunState.h"
 #include "zeek/Scope.h"
 #include "zeek/Stmt.h"
 #include "zeek/Val.h"

src/Func.cc

@@ -339,7 +339,6 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
         f->SetTriggerAssoc(parent->GetTriggerAssoc());
     }
 
-    if ( ! g_policy_debug )
     g_frame_stack.push_back(f.get()); // used for backtracing
     const CallExpr* call_expr = parent ? parent->GetCall() : nullptr;
     call_stack.emplace_back(CallInfo{call_expr, this, *args});
@@ -392,7 +391,6 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
         catch ( InterpreterException& e ) {
             // Already reported, but now determine whether to unwind further.
             if ( Flavor() == FUNC_FLAVOR_FUNCTION ) {
-                if ( ! g_policy_debug )
                 g_frame_stack.pop_back();
                 call_stack.pop_back();
                 // Result not set b/c exception was thrown
@@ -450,7 +448,6 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
         g_trace_state.LogTrace("Function return: %s\n", d.Description());
     }
 
-    if ( ! g_policy_debug )
     g_frame_stack.pop_back();
 
     return result;

src/Stmt.cc

@@ -12,6 +12,7 @@
 #include "zeek/Frame.h"
 #include "zeek/IntrusivePtr.h"
 #include "zeek/Reporter.h"
+#include "zeek/RunState.h"
 #include "zeek/Scope.h"
 #include "zeek/Traverse.h"
 #include "zeek/Trigger.h"

src/zeek-setup.cc

@@ -1105,7 +1105,6 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
         auto [body, scope] = get_global_stmts();
         StmtFlowType flow;
         Frame f(scope->Length(), nullptr, nullptr);
-        if ( ! g_policy_debug )
         g_frame_stack.push_back(&f);
 
         try {
@@ -1114,7 +1113,6 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
             reporter->FatalError("failed to execute script statements at top-level scope");
         }
 
-        if ( ! g_policy_debug )
         g_frame_stack.pop_back();
     }