Skip to content

Commit 0a6a89d

Browse files
committed
Fix compilations error after rebase
1 parent 684dbef commit 0a6a89d

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@
182182
import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
183183
import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
184184
import com.oracle.graal.python.runtime.PythonContext;
185+
import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
185186
import com.oracle.graal.python.runtime.PythonCore;
186187
import com.oracle.graal.python.runtime.PythonOptions;
187188
import com.oracle.graal.python.runtime.PythonParser.ParserMode;
@@ -203,6 +204,7 @@
203204
import com.oracle.truffle.api.debug.Debugger;
204205
import com.oracle.truffle.api.dsl.Cached;
205206
import com.oracle.truffle.api.dsl.Cached.Shared;
207+
import com.oracle.truffle.api.dsl.CachedLanguage;
206208
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
207209
import com.oracle.truffle.api.dsl.ImportStatic;
208210
import com.oracle.truffle.api.dsl.ReportPolymorphism;
@@ -1097,16 +1099,18 @@ final boolean doRecursiveWithNode(VirtualFrame frame, Object instance, PTuple cl
10971099

10981100
@Specialization(guards = "depth >= getNodeRecursionLimit()")
10991101
final boolean doRecursiveWithLoop(VirtualFrame frame, Object instance, PTuple clsTuple,
1102+
@CachedLanguage PythonLanguage language,
11001103
@Cached("createNonRecursive()") RecursiveBinaryCheckBaseNode node) {
1101-
Object state = IndirectCallContext.enter(frame, getContext(), this);
1104+
PythonThreadState threadState = getContext().getThreadState(language);
1105+
Object state = IndirectCallContext.enter(frame, threadState, this);
11021106
try {
11031107
// Note: we need actual recursion to trigger the stack overflow error like CPython
11041108
// Note: we need fresh RecursiveBinaryCheckBaseNode and cannot use "this", because
11051109
// children of this executed by other specializations may assume they'll always get
11061110
// non-null frame
11071111
return callRecursiveWithNodeTruffleBoundary(instance, clsTuple, node);
11081112
} finally {
1109-
IndirectCallContext.exit(frame, getContext(), state);
1113+
IndirectCallContext.exit(frame, threadState, state);
11101114
}
11111115
}
11121116

0 commit comments

Comments
 (0)