pass virtual frame to GetNameFromLocalNode

Author: tomasstupka

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

@@ -58,14 +58,15 @@
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
+import com.oracle.truffle.api.frame.VirtualFrame;
 
 @GenerateUncached
 @ImportStatic(SpecialMethodSlot.class)
 public abstract class GetNameFromLocalsNode extends PNodeWithContext {
     public abstract Object execute(Frame frame, Object locals, String name, boolean cellvar);
 
     @Specialization
-    Object getValue(Frame frame, Object locals, String name, boolean isCellVar,
+    Object getValue(VirtualFrame frame, Object locals, String name, boolean isCellVar,
                     @Cached PyDictCheckExactNode checkDictNode,
                     @Cached PyDictGetItem getDictItemNode,
                     @Cached PyObjectGetItem getItemNode,

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

@@ -936,7 +936,7 @@ Object executeFromBci(VirtualFrame virtualFrame, Frame localFrame, Frame stackFr
                     }
                     case OpCodesConstants.LOAD_CLASSDEREF: {
                         oparg |= Byte.toUnsignedInt(localBC[++bci]);
-                        stackTop = bytecodeLoadClassDefRef(localFrame, stackFrame, locals, stackTop, beginBci, localNodes, oparg);
+                        stackTop = bytecodeLoadClassDeref(virtualFrame, localFrame, stackFrame, locals, stackTop, beginBci, localNodes, oparg);
                         break;
                     }
                     case OpCodesConstants.LOAD_DEREF: {
@@ -1539,7 +1539,7 @@ private int bytecodeStoreDeref(Frame localFrame, Frame stackFrame, int stackTop,
         return stackTop;
     }
 
-    private int bytecodeLoadClassDefRef(Frame localFrame, Frame stackFrame, Object locals, int stackTop, int bci, Node[] localNodes, int oparg) {
+    private int bytecodeLoadClassDeref(VirtualFrame virtualFrame, Frame localFrame, Frame stackFrame, Object locals, int stackTop, int bci, Node[] localNodes, int oparg) {
         String name;
         boolean isCellVar;
         if (oparg < cellvars.length) {
@@ -1550,7 +1550,7 @@ private int bytecodeLoadClassDefRef(Frame localFrame, Frame stackFrame, Object l
             isCellVar = false;
         }
         GetNameFromLocalsNode getNameFromLocals = insertChildNode(localNodes, bci, NODE_GET_NAME_FROM_LOCALS);
-        Object value = getNameFromLocals.execute(stackFrame, locals, name, isCellVar);
+        Object value = getNameFromLocals.execute(virtualFrame, locals, name, isCellVar);
         if (value != null) {
             stackFrame.setObject(++stackTop, value);
             return stackTop;