Pass index to load LoadVariableArguments and LoadKeywordArguments

msimacek · msimacek · commit fb00bf692d37 · 2025-09-08T10:23:45.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java b/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();
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java b/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]);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1524,15 +1524,15 @@ private void copyArguments(ArgumentsTy args, Builder b) {`
`1524`	`1524`	`BytecodeLocal local = getLocal(args.varArg.arg);`
`1525`	`1525`	`assert local != null;`
`1526`	`1526`	`b.beginStoreLocal(local);`
`1527`		`- b.emitLoadVariableArguments();`
	`1527`	`+ b.emitLoadVariableArguments(argIdx++);`
`1528`	`1528`	`b.endStoreLocal();`
`1529`	`1529`	`}`
`1530`	`1530`
`1531`	`1531`	`if (args.kwArg != null) {`
`1532`	`1532`	`BytecodeLocal local = getLocal(args.kwArg.arg);`
`1533`	`1533`	`assert local != null;`
`1534`	`1534`	`b.beginStoreLocal(local);`
`1535`		`- b.emitLoadKeywordArguments();`
	`1535`	`+ b.emitLoadKeywordArguments(argIdx);`
`1536`	`1536`	`b.endStoreLocal();`
`1537`	`1537`	`}`
`1538`	`1538`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1051,25 +1051,22 @@ public static boolean hasLocals(VirtualFrame frame) {`
`1051`	`1051`	`}`
`1052`	`1052`
`1053`	`1053`	`@Operation`
	`1054`	`+ @ConstantOperand(type = int.class)`
`1054`	`1055`	`public static final class LoadVariableArguments {`
`1055`	`1056`	`@Specialization`
`1056`		`- public static Object perform(VirtualFrame frame,`
	`1057`	`+ public static Object perform(VirtualFrame frame, int index,`
`1057`	`1058`	`@Bind PBytecodeDSLRootNode rootNode) {`
`1058`		`- int index = rootNode.co.getRegularArgCount();`
`1059`		`- return PFactory.createTuple(rootNode.getLanguage(), (Object[]) PArguments.getArgument(frame, index));`
	`1059`	`+ return PFactory.createTuple(rootNode.getLanguage(), (Object[]) frame.getArguments()[index]);`
`1060`	`1060`	`}`
`1061`	`1061`	`}`
`1062`	`1062`
`1063`	`1063`	`@Operation`
	`1064`	`+ @ConstantOperand(type = int.class)`
`1064`	`1065`	`public static final class LoadKeywordArguments {`
`1065`	`1066`	`@Specialization`
`1066`		`- public static Object perform(VirtualFrame frame,`
	`1067`	`+ public static Object perform(VirtualFrame frame, int index,`
`1067`	`1068`	`@Bind PBytecodeDSLRootNode rootNode) {`
`1068`		`- int index = rootNode.co.getRegularArgCount();`
`1069`		`- if (rootNode.co.takesVarArgs()) {`
`1070`		`- index++;`
`1071`		`- }`
`1072`		`- return PFactory.createDict(rootNode.getLanguage(), (PKeyword[]) PArguments.getArgument(frame, index));`
	`1069`	`+ return PFactory.createDict(rootNode.getLanguage(), (PKeyword[]) frame.getArguments()[index]);`
`1073`	`1070`	`}`
`1074`	`1071`	`}`
`1075`	`1072`