Create all cells in one instruction

Author: msimacek

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

@@ -1449,31 +1449,21 @@ public void setUpFrame(ArgumentsTy args, Builder b) {
         copyArguments(args, b);
 
         if (cellVariableLocals.length > 0) {
-            List<BytecodeLocal> toClear = new ArrayList<>();
-
-            b.beginStoreRange(cellVariableLocals);
-            b.beginCollectToObjectArray();
+            b.emitCreateCells(cellVariableLocals);
             for (int i = 0; i < cellVariableLocals.length; i++) {
-                b.beginCreateCell(i);
                 if (scope.getUseOfName(cellVariables[i]).contains(DefUse.DefParam)) {
                     /*
                      * To simplify the argument copying performed above, we copy cell params into
                      * regular locals just like all other arguments. Then, here we move the value
                      * into a cell and clear the regular local.
                      */
                     BytecodeLocal param = getLocal(cellVariables[i]);
+                    b.beginStoreCell();
+                    b.emitLoadLocal(cellVariableLocals[i]);
                     b.emitLoadLocal(param);
-                    toClear.add(param);
-                } else {
-                    b.emitLoadNull();
+                    b.endStoreCell();
+                    b.emitClearLocal(param);
                 }
-                b.endCreateCell();
-            }
-            b.endCollectToObjectArray();
-            b.endStoreRange();
-
-            for (BytecodeLocal local : toClear) {
-                b.emitClearLocal(local);
             }
         }
 

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

@@ -2459,14 +2459,15 @@ public static void doStoreCell(PCell cell, Object value) {
     }
 
     @Operation
-    @ConstantOperand(type = int.class)
-    public static final class CreateCell {
+    @ConstantOperand(type = LocalRangeAccessor.class)
+    public static final class CreateCells {
         @Specialization
-        public static PCell doCreateCell(int index, Object value,
+        public static void doCreateCells(VirtualFrame frame, LocalRangeAccessor locals,
                         @Bind PBytecodeDSLRootNode rootNode) {
-            PCell cell = new PCell(rootNode.cellEffectivelyFinalAssumptions[index]);
-            cell.setRef(value);
-            return cell;
+            for (int i = 0; i < locals.getLength(); i++) {
+                PCell cell = new PCell(rootNode.cellEffectivelyFinalAssumptions[i]);
+                locals.setObject(rootNode.getBytecodeNode(), frame, i, cell);
+            }
         }
     }