Transfer to interpreter eariler on tracing jumps

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -616,6 +616,7 @@ public final class PBytecodeRootNode extends PRootNode implements BytecodeOSRNod
     private static final byte TRACE_PROFILE_NEW_FRAME = 1 << 1;
     private static final byte TRACE_PROFILE_EXISTING_FRAME = 1 << 2;
     private static final byte TRACE_PROFILE_SYNC_LOCALS_BACK = 1 << 3;
+    private static final byte TRACE_PROFILE_DID_JUMP = 1 << 4;
     @CompilationFinal(dimensions = 1) byte[] traceProfileData;
 
     @CompilationFinal private Object osrMetadata;
@@ -1346,10 +1347,9 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
             if (isTracingEnabled(tracingOrProfilingEnabled)) {
                 final int stackDiff = traceLine(virtualFrame, mutableData, localBC, bci);
                 if (stackDiff <= 0) {
-                    // The loop must be partially unrollable assuming a certain sequence of bytecode
-                    // instructions. A jump can happen non-deterministically and thus break this
-                    // assumption. This can happen repeatedly, so we don't invalidate
-                    CompilerDirectives.transferToInterpreter();
+                    // See traceLine, if we get here, we should be in the interpreter already, but
+                    // SVM can't prove it, so transfer again
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
                     bci = mutableData.getJumpBci();
                     stackTop += stackDiff;
                     continue;
@@ -3050,6 +3050,11 @@ private int traceLine(VirtualFrame virtualFrame, MutableLoopData mutableData, by
                 invokeTraceFunction(virtualFrame, null, mutableData.getThreadState(this), mutableData, PythonContext.TraceEvent.LINE,
                                 mutableData.getPastLine(), true, bci);
                 if (pyFrame.didJump()) {
+                    enterTraceProfile(bci, TRACE_PROFILE_DID_JUMP);
+                    // The loop must be partially unrollable assuming a certain sequence of bytecode
+                    // instructions. A jump can happen non-deterministically and thus break this
+                    // assumption. This can happen repeatedly, so we don't invalidate
+                    CompilerDirectives.transferToInterpreter();
                     int newBci = lineToBci(pyFrame.getJumpDestLine());
                     mutableData.setPastBci(bci);
                     if (newBci == BytecodeCodeUnit.LINE_TO_BCI_LINE_AFTER_CODEBLOCK) {