Pass RootNode directly to CalleeContext.enter to avoid the loop in getRootNode()

Author: steve-s

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/modules/ConversionNodeTests.java

@@ -76,7 +76,7 @@ protected static Object call(Object arg, ArgumentCastNode castNode) {
             public Object execute(VirtualFrame frame) {
                 GilNode gilNode = GilNode.getUncached();
                 boolean wasAcquired = gilNode.acquire();
-                calleeContext.enter(frame);
+                calleeContext.enter(frame, this);
                 try {
                     return node.execute(frame, PArguments.getArgument(frame, 0));
                 } finally {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ExternalFunctionNodes.java

@@ -871,7 +871,7 @@ private void prepareArguments(Object[] arguments) {
 
         @Override
         public final Object execute(VirtualFrame frame) {
-            calleeContext.enter(frame);
+            calleeContext.enter(frame, this);
             try {
                 Object callable = ensureReadCallableNode().execute(frame);
                 Object[] cArguments = prepareCArguments(frame);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SortNodes.java

@@ -125,7 +125,7 @@ enum Result {
 
         @Override
         public Object execute(VirtualFrame frame) {
-            calleeContext.enter(frame);
+            calleeContext.enter(frame, this);
             try {
                 Object[] arguments = frame.getArguments();
                 Object a = arguments[PArguments.USER_ARGUMENTS_OFFSET];

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyTraceBackPrint.java

@@ -345,7 +345,7 @@ private static void printInternal(Node inliningTarget, TracebackBuiltins.GetTrac
         PythonLanguage language = PythonLanguage.get(inliningTarget);
         while (tb != null) {
             final PCode code = getCode(language, getTbFrameNode, tb);
-            if (lastFile == null ||
+            if (lastFile == null || code.getFilename() == null ||
                             !tstrEqNode.execute(code.getFilename(), lastFile, TS_ENCODING) ||
                             lastLine == -1 || tb.getLineno() != lastLine ||
                             lastName == null || !tstrEqNode.execute(code.getName(), lastName, TS_ENCODING)) {

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

@@ -1086,7 +1086,7 @@ int getInitialStackTop() {
 
     @Override
     public Object execute(VirtualFrame virtualFrame) {
-        calleeContext.enter(virtualFrame);
+        calleeContext.enter(virtualFrame, this);
         try {
             copyArgsAndCells(virtualFrame, virtualFrame.getArguments());
             return executeFromBci(virtualFrame, virtualFrame, this, 0, getInitialStackTop());

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java

@@ -452,7 +452,7 @@ public static final class EnterCalleeContext {
         @Specialization
         public static void doEnter(VirtualFrame frame,
                         @Bind PBytecodeDSLRootNode root) {
-            root.calleeContext.enter(frame);
+            root.calleeContext.enter(frame, root);
 
             if (root.needsTraceAndProfileInstrumentation()) {
                 root.ensureTraceAndProfileEnabled();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/BuiltinFunctionRootNode.java

@@ -332,7 +332,7 @@ public Object execute(VirtualFrame frame) {
                 body = insert(newBody);
             }
         }
-        calleeContext.enter(frame);
+        calleeContext.enter(frame, this);
         try {
             return body.execute(frame);
         } finally {

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

@@ -288,7 +288,7 @@ protected CallRootNode(TruffleLanguage<?> language) {
 
         @Override
         public Object execute(VirtualFrame frame) {
-            calleeContext.enter(frame);
+            calleeContext.enter(frame, this);
             Object[] frameArguments = frame.getArguments();
             Object callable = PArguments.getArgument(frameArguments, ASYNC_CALLABLE_INDEX);
             int frameIndex = (int) PArguments.getArgument(frameArguments, ASYNC_FRAME_INDEX_INDEX);

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

@@ -365,8 +365,8 @@ public static PassExceptionStateNode getUncached() {
     }
 
     /**
-     * Execution of a Python function should be wrapped with {@link #enter(VirtualFrame)} and
-     * {@link #exit(VirtualFrame, PRootNode)}.
+     * Execution of a Python function should be wrapped with {@link #enter(VirtualFrame, PRootNode)}
+     * and {@link #exit(VirtualFrame, PRootNode)}.
      * <p>
      * When entering the function we create the
      * {@link com.oracle.graal.python.builtins.objects.frame.PFrame.Reference} that represents the
@@ -397,12 +397,12 @@ public Node copy() {
         /**
          * Wrap the execution of a Python callee called from a Python frame.
          */
-        public void enter(VirtualFrame frame) {
+        public void enter(VirtualFrame frame, PRootNode rootNode) {
             // TODO: assert PythonLanguage.getContext().ownsGil() :
             // PythonContext.dumpStackOnAssertionHelper("callee w/o GIL");
             // tfel: Create our frame reference here and store it so that
             // there's no reference to it from the caller side.
-            PFrame.Reference thisFrameRef = new PFrame.Reference(getRootNode(), PArguments.getCallerFrameInfo(frame));
+            PFrame.Reference thisFrameRef = new PFrame.Reference(rootNode, PArguments.getCallerFrameInfo(frame));
             PArguments.setCurrentFrameInfo(frame, thisFrameRef);
         }