Remove GetNextWithoutFrameNode

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/keywords/CopyKeywordsNode.java

@@ -63,8 +63,10 @@
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @ImportStatic(PythonOptions.class)
 @GenerateUncached
@@ -145,18 +147,23 @@ void doBuiltinDict(@SuppressWarnings("unused") PArguments.ThreadState state, PDi
 
     @Specialization(guards = "!isBuiltinDict(starargs, classProfile)", limit = "getCallSiteInlineCacheMaxDepth()")
     void doDict(PArguments.ThreadState state, PDict starargs, PKeyword[] keywords,
-                    @Cached GetNextNode.GetNextWithoutFrameNode getNextNode,
+                    @Cached GetNextNode getNextNode,
                     @Cached CastToJavaStringNode castToJavaStringNode,
                     @Cached IsBuiltinClassProfile errorProfile,
                     @CachedLibrary("starargs") PythonObjectLibrary pol,
                     @Cached PRaiseNode raiseNode,
+                    @Cached ConditionProfile gotState,
                     @SuppressWarnings("unused") @Cached IsBuiltinClassProfile classProfile) {
         Object iter = pol.getIteratorWithState(starargs, state);
         int i = 0;
         while (true) {
             Object key;
             try {
-                key = getNextNode.executeWithGlobalState(iter);
+                VirtualFrame frame = null;
+                if (gotState.profile(state != null)) {
+                    frame = PArguments.frameForCall(state);
+                }
+                key = getNextNode.execute(frame, iter);
                 Object value = pol.lookupAndCallSpecialMethodWithState(starargs, state, __GETITEM__, key);
                 keywords[i++] = new PKeyword(castToJavaStringNode.execute(key), value);
             } catch (PException e) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/positional/ExecutePositionalStarargsNode.java

@@ -56,7 +56,6 @@
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
-import com.oracle.graal.python.nodes.control.GetNextNode.GetNextWithoutFrameNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -205,14 +204,14 @@ static Object[] starargs(PNone none,
         static Object[] starargs(Object object,
                         @Cached PRaiseNode raise,
                         @CachedLibrary("object") PythonObjectLibrary lib,
-                        @Cached GetNextWithoutFrameNode nextNode,
+                        @Cached GetNextNode nextNode,
                         @Cached IsBuiltinClassProfile errorProfile) {
             Object iterator = lib.getIterator(object);
             if (iterator != PNone.NO_VALUE && iterator != PNone.NONE) {
                 ArrayList<Object> internalStorage = new ArrayList<>();
                 while (true) {
                     try {
-                        addToList(internalStorage, nextNode.executeWithGlobalState(iterator));
+                        addToList(internalStorage, nextNode.execute(null, iterator));
                     } catch (PException e) {
                         e.expectStopIteration(errorProfile);
                         return toArray(internalStorage);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/GetNextNode.java

@@ -49,18 +49,13 @@
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
-import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode.LookupAndCallUnaryDynamicNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode.NoAttributeHandler;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.GenerateUncached;
-import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
 public abstract class GetNextNode extends PNodeWithContext {
     public abstract Object execute(Frame frame, Object iterator);
@@ -185,25 +180,4 @@ public static GetNextNode create() {
     public static GetNextNode getUncached() {
         return GetNextUncached.INSTANCE;
     }
-
-    @GenerateUncached
-    public abstract static class GetNextWithoutFrameNode extends PNodeWithContext {
-
-        public abstract Object executeWithGlobalState(Object iterator);
-
-        private static Object checkResult(PRaiseNode raiseNode, ConditionProfile notAnIterator, Object result, Object iterator) {
-            if (notAnIterator.profile(result == PNone.NO_VALUE)) {
-                throw raiseNode.raise(PythonErrorType.AttributeError, ErrorMessages.OBJ_P_HAS_NO_ATTR_S, iterator, __NEXT__);
-            }
-            return result;
-        }
-
-        @Specialization
-        Object doObject(Object iterator,
-                        @Cached LookupAndCallUnaryDynamicNode nextCall,
-                        @Cached PRaiseNode raiseNode,
-                        @Cached("createBinaryProfile()") ConditionProfile notAnIterator) {
-            return checkResult(raiseNode, notAnIterator, nextCall.executeObject(iterator, __NEXT__), iterator);
-        }
-    }
 }