Pass index to load LoadVariableArguments and LoadKeywordArguments

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java

@@ -1524,15 +1524,15 @@ private void copyArguments(ArgumentsTy args, Builder b) {
             BytecodeLocal local = getLocal(args.varArg.arg);
             assert local != null;
             b.beginStoreLocal(local);
-            b.emitLoadVariableArguments();
+            b.emitLoadVariableArguments(argIdx++);
             b.endStoreLocal();
         }
 
         if (args.kwArg != null) {
             BytecodeLocal local = getLocal(args.kwArg.arg);
             assert local != null;
             b.beginStoreLocal(local);
-            b.emitLoadKeywordArguments();
+            b.emitLoadKeywordArguments(argIdx);
             b.endStoreLocal();
         }
     }

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

@@ -1051,25 +1051,22 @@ public static boolean hasLocals(VirtualFrame frame) {
     }
 
     @Operation
+    @ConstantOperand(type = int.class)
     public static final class LoadVariableArguments {
         @Specialization
-        public static Object perform(VirtualFrame frame,
+        public static Object perform(VirtualFrame frame, int index,
                         @Bind PBytecodeDSLRootNode rootNode) {
-            int index = rootNode.co.getRegularArgCount();
-            return PFactory.createTuple(rootNode.getLanguage(), (Object[]) PArguments.getArgument(frame, index));
+            return PFactory.createTuple(rootNode.getLanguage(), (Object[]) frame.getArguments()[index]);
         }
     }
 
     @Operation
+    @ConstantOperand(type = int.class)
     public static final class LoadKeywordArguments {
         @Specialization
-        public static Object perform(VirtualFrame frame,
+        public static Object perform(VirtualFrame frame, int index,
                         @Bind PBytecodeDSLRootNode rootNode) {
-            int index = rootNode.co.getRegularArgCount();
-            if (rootNode.co.takesVarArgs()) {
-                index++;
-            }
-            return PFactory.createDict(rootNode.getLanguage(), (PKeyword[]) PArguments.getArgument(frame, index));
+            return PFactory.createDict(rootNode.getLanguage(), (PKeyword[]) frame.getArguments()[index]);
         }
     }