[GR-71268] Fix regression in repeated-import.py.

PullRequest: graalpython/4097

Author: steve-s

graalpython/com.oracle.graal.python.test/src/tests/test_indirect_call.py

@@ -53,8 +53,7 @@
 # Because of splitting, the code may not stabilize after first iteration and we may
 # see some stack walks during first few iterations. With default runtime or splitting
 # disabled, these tests should pass with STABILIZES_AT=1
-STABILIZES_AT = 1 if sys.implementation.name != "graalpy" or __graalpython__.truffle_runtime == 'Interpreted' else 10
-STABILIZES_AT = int(os.environ.get('GRAALPY_TEST_INDIRECT_CALL_STABILIZES_AT', STABILIZES_AT))
+STABILIZES_AT = int(os.environ.get('GRAALPY_TEST_INDIRECT_CALL_STABILIZES_AT', 10))
 
 has_stack_walk_check = False
 if sys.implementation.name == "graalpy":

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

@@ -174,7 +174,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLogger;
@@ -225,7 +224,6 @@ public void initialize(Python3Core core) {
         super.initialize(core);
         addBuiltinConstant("is_native", TruffleOptions.AOT);
         addBuiltinConstant("is_bytecode_dsl_interpreter", PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER);
-        addBuiltinConstant("truffle_runtime", PythonUtils.toTruffleStringUncached(Truffle.getRuntime().getName()));
         PythonContext ctx = core.getContext();
         TruffleString encodingOpt = ctx.getLanguage().getEngineOption(PythonOptions.StandardStreamEncoding);
         TruffleString standardStreamEncoding = null;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/ExecutionContext.java

@@ -447,15 +447,11 @@ private void exitEscaped(VirtualFrame frame, PRootNode node, Node location, Refe
                 }
                 // ReadCallerFrameNode.getCallerFrame must have the assumption invalidated
                 assert node.needsCallerFrame() : "stack walk did not invalidate caller frame assumption";
-            } else {
-                // We may have been called via uncached call where we always pass frame reference,
-                // but make sure that even if the next call is cached, we get passed the rereference
-                // from our callers
-                if (!node.needsCallerFrame()) {
-                    CompilerDirectives.transferToInterpreterAndInvalidate();
-                    node.setNeedsCallerFrame();
-                }
             }
+            // Else: we may have been called via uncached call where we always pass frame reference.
+            // We assume uncached execution will eventually flip to cached execution, and then we'll
+            // go to the other branch and setNeedsCallerFrame. This helps to prevent one-off
+            // initializations (importing a module) from invalidating the assumption
 
             // force the frame so that it can be accessed later
             if (PythonOptions.ENABLE_BYTECODE_DSL_INTERPRETER && node instanceof PBytecodeDSLRootNode) {