PCode: add support for setting the flags from CodeUnit internal flags

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

@@ -97,10 +97,10 @@
 public final class PCode extends PythonBuiltinObject {
     public static final long FLAG_VAR_ARGS = 0x4;
     public static final long FLAG_VAR_KW_ARGS = 0x8;
-    static final long FLAG_LAMBDA = 0x10; // CO_NESTED on CPython, not needed
-    static final long FLAG_GENERATOR = 0x20;
-    static final long FLAG_MODULE = 0x40; // CO_NOFREE on CPython, we use it on modules, it's
-                                          // redundant anyway
+    public static final long FLAG_LAMBDA = 0x10; // CO_NESTED on CPython, not needed
+    public static final long FLAG_GENERATOR = 0x20;
+    public static final long FLAG_MODULE = 0x40; // CO_NOFREE on CPython, we use it on modules, it's
+    // redundant anyway
 
     // callTargetSupplier may be null, in which case callTarget and signature will be
     // set. Otherwise, these are lazily created from the supplier.
@@ -383,6 +383,14 @@ private static int extractFlags(RootNode rootNode) {
         if (funcRootNode instanceof ModuleRootNode) {
             // Not on CPython
             flags |= FLAG_MODULE;
+        }
+        if (funcRootNode instanceof PBytecodeRootNode) {
+            CodeUnit codeUnit = ((PBytecodeRootNode) funcRootNode).getCodeUnit();
+            flags = getFlags(flags, codeUnit);
+        }
+        if (funcRootNode instanceof PBytecodeGeneratorFunctionRootNode) {
+            CodeUnit codeUnit = ((PBytecodeGeneratorFunctionRootNode) funcRootNode).getBytecodeRootNode().getCodeUnit();
+            flags = getFlags(flags, codeUnit);
         } else {
             // 0x20 - generator
             if (funcRootNode instanceof GeneratorFunctionRootNode) {
@@ -405,6 +413,14 @@ private static int extractFlags(RootNode rootNode) {
         return flags;
     }
 
+    private static int getFlags(int flags, CodeUnit codeUnit) {
+        flags |= codeUnit.isGenerator() ? FLAG_GENERATOR : 0;
+        flags |= codeUnit.takesVarArgs() ? FLAG_VAR_ARGS : 0;
+        flags |= codeUnit.takesVarKeywordArgs() ? FLAG_VAR_KW_ARGS : 0;
+        flags |= codeUnit.isLambda() ? FLAG_LAMBDA : 0;
+        return flags;
+    }
+
     RootNode getRootNode() {
         return getRootCallTarget().getRootNode();
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/CodeUnit.java

@@ -49,6 +49,7 @@
 import com.oracle.graal.python.builtins.objects.bytes.BytesUtils;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.compiler.OpCodes.CollectionBits;
+import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.util.PythonUtils;
 
 /**
@@ -94,6 +95,8 @@ public final class CodeUnit {
 
     public final int startOffset;
 
+    public final boolean lambda;
+
     public CodeUnit(String name, String qualname,
                     int argCount, int kwOnlyArgCount, int positionalOnlyArgCount, int stacksize,
                     byte[] code, byte[] linetable, int flags,
@@ -118,6 +121,7 @@ public CodeUnit(String name, String qualname,
         this.primitiveConstants = primitiveConstants;
         this.exceptionHandlerRanges = exceptionHandlerRanges;
         this.startOffset = startOffset;
+        this.lambda = name.equals(BuiltinNames.LAMBDA_NAME);
     }
 
     OpCodes codeForBC(int bc) {
@@ -186,6 +190,10 @@ public boolean isGeneratorOrCoroutine() {
         return (flags & (IS_GENERATOR | IS_COROUTINE)) != 0;
     }
 
+    public boolean isLambda() {
+        return lambda;
+    }
+
     @SuppressWarnings("fallthrough")
     @Override
     public String toString() {

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

@@ -93,7 +93,7 @@ int makeFunction(Object globals, int initialStackTop, Frame localFrame, int flag
         PCode codeObj = cachedCode;
         if (codeObj == null) {
             // Multi-context mode
-            codeObj = createCode(factory, code, callTarget, signature);
+            codeObj = factory.createCode(callTarget, signature, code);
         }
 
         PCell[] closure = null;
@@ -140,11 +140,6 @@ int makeFunction(Object globals, int initialStackTop, Frame localFrame, int flag
         return stackTop;
     }
 
-    private static PCode createCode(PythonObjectFactory factory, CodeUnit code, RootCallTarget callTarget, Signature signature) {
-        return factory.createCode(callTarget, signature, code.varnames.length, code.stacksize, code.flags, code.constants, code.names,
-                        code.varnames, code.freevars, code.cellvars, null, code.name, code.startOffset, code.srcOffsetTable);
-    }
-
     public static MakeFunctionNode create(PythonLanguage language, CodeUnit code, Source source) {
         RootCallTarget callTarget;
         PBytecodeRootNode bytecodeRootNode = new PBytecodeRootNode(language, code, source);
@@ -156,7 +151,7 @@ public static MakeFunctionNode create(PythonLanguage language, CodeUnit code, So
         }
         PCode cachedCode = null;
         if (language.isSingleContext()) {
-            cachedCode = createCode(PythonObjectFactory.getUncached(), code, callTarget, bytecodeRootNode.getSignature());
+            cachedCode = PythonObjectFactory.getUncached().createCode(callTarget, bytecodeRootNode.getSignature(), code);
         }
         String doc = null;
         if (code.constants.length > 0 && code.constants[0] instanceof String) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -190,6 +190,7 @@
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetMroStorageNode;
 import com.oracle.graal.python.builtins.objects.zipimporter.PZipImporter;
+import com.oracle.graal.python.compiler.CodeUnit;
 import com.oracle.graal.python.nodes.bytecode.PBytecodeRootNode;
 import com.oracle.graal.python.nodes.literal.ListLiteralNode;
 import com.oracle.graal.python.parser.ExecutionCellSlots;
@@ -1091,6 +1092,11 @@ public final PCode createCode(RootCallTarget ct, int flags, int firstlineno, byt
         return trace(new PCode(PythonBuiltinClassType.PCode, PythonBuiltinClassType.PCode.getInstanceShape(getLanguage()), ct, flags, firstlineno, lnotab, filename));
     }
 
+    public final PCode createCode(RootCallTarget callTarget, Signature signature, CodeUnit codeUnit) {
+        return createCode(callTarget, signature, codeUnit.varnames.length, codeUnit.stacksize, -1, codeUnit.constants, codeUnit.names,
+                        codeUnit.varnames, codeUnit.freevars, codeUnit.cellvars, null, codeUnit.name, codeUnit.startOffset, codeUnit.srcOffsetTable);
+    }
+
     public final PCode createCode(RootCallTarget callTarget, Signature signature, int nlocals, int stacksize, int flags, Object[] constants, Object[] names, Object[] varnames,
                     Object[] freevars, Object[] cellvars, String filename, String name, int firstlineno, byte[] lnotab) {
         return trace(new PCode(PythonBuiltinClassType.PCode, getShape(PythonBuiltinClassType.PCode), callTarget, signature, nlocals, stacksize, flags, constants, names, varnames, freevars, cellvars,