Do not use ImmutableList.copyOf whilst finding the innermost starlark…

… function of a StarlarkThread. RELNOTES: None. PiperOrigin-RevId: 514374572 Change-Id: I719489ebb78fd8c9a230d09a962e1208dd01eda9
fweikert · Mar 6, 2023 · f4c5a95 · f4c5a95
1 parent 8681437
commit f4c5a95
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/net/starlark/java/eval/Module.java b/src/main/java/net/starlark/java/eval/Module.java
@@ -104,10 +104,9 @@ public static Module create() {
    */
   @Nullable
   public static Module ofInnermostEnclosingStarlarkFunction(StarlarkThread thread) {
-    for (Debug.Frame fr : thread.getDebugCallStack().reverse()) {
-      if (fr.getFunction() instanceof StarlarkFunction) {
-        return ((StarlarkFunction) fr.getFunction()).getModule();
-      }
+    StarlarkFunction fn = thread.getInnermostEnclosingStarlarkFunction();
+    if (fn != null) {
+      return fn.getModule();
     }
     return null;
   }

diff --git a/src/main/java/net/starlark/java/eval/StarlarkThread.java b/src/main/java/net/starlark/java/eval/StarlarkThread.java
@@ -440,6 +440,17 @@ ImmutableList<Debug.Frame> getDebugCallStack() {
     return ImmutableList.copyOf(callstack);
   }
 
+  @Nullable
+  StarlarkFunction getInnermostEnclosingStarlarkFunction() {
+    for (int i = callstack.size() - 1; i >= 0; i--) {
+      Debug.Frame fr = callstack.get(i);
+      if (fr.getFunction() instanceof StarlarkFunction) {
+        return (StarlarkFunction) fr.getFunction();
+      }
+    }
+    return null;
+  }
+
   /** Returns the size of the callstack. This is needed for the debugger. */
   int getCallStackSize() {
     return callstack.size();