1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BaseFunction.java b/src/main/java/com/google/devtools/build/lib/syntax/BaseFunction.java
index b5ceb0c039..e445e46cf8 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BaseFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BaseFunction.java
@@ -440,10 +440,14 @@ public abstract class BaseFunction implements SkylarkValue {
     canonicalizeArguments(arguments, loc);
 
     try {
-      Callstack.push(this);
+      if (Callstack.enabled) {
+        Callstack.push(this);
+      }
       return call(arguments, ast, env);
     } finally {
-      Callstack.pop();
+      if (Callstack.enabled) {
+        Callstack.pop();
+      }
     }
   }