fix code object lnotab, code and flags internal types

- changed exception message to match cpython on incompatible args (builtin constructor)
- code builtins getters return empty vals for the unsupported types

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -52,6 +52,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETITEM__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.NotImplementedError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.StopIteration;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
 
@@ -1843,8 +1844,6 @@ Object call() {
     @Builtin(name = "code", constructsClass = {PythonBuiltinClassType.PCode}, isPublic = false, minNumOfPositionalArgs = 14, maxNumOfPositionalArgs = 16)
     @GenerateNodeFactory
     public abstract static class CodeTypeNode extends PythonBuiltinNode {
-        @Child private SequenceStorageNodes.ToByteArrayNode toByteArrayNode;
-
         @Specialization
         Object call(PythonClass cls, int argcount, int kwonlyargcount,
                         int nlocals, int stacksize, int flags,
@@ -1854,26 +1853,29 @@ Object call(PythonClass cls, int argcount, int kwonlyargcount,
                         String lnotab) {
             return factory().createCode(cls, argcount, kwonlyargcount,
                             nlocals, stacksize, flags,
-                            codestring, constants, names,
+                            toBytes(codestring), constants.getArray(), names.getArray(),
                             varnames.getArray(), freevars.getArray(), cellvars.getArray(),
                             filename, name, firstlineno,
-                            lnotab);
+                            toBytes(lnotab));
         }
 
         @Specialization
-        @TruffleBoundary
         Object call(PythonClass cls, int argcount, int kwonlyargcount,
                         int nlocals, int stacksize, int flags,
                         PBytes codestring, PTuple constants, PTuple names,
                         PTuple varnames, PTuple freevars, PTuple cellvars,
                         PString filename, PString name, int firstlineno,
-                        PBytes lnotab) {
+                        PBytes lnotab,
+                        @Cached("create()") SequenceStorageNodes.ToByteArrayNode toByteArrayNode) {
+            byte[] codeBytes = toByteArrayNode.execute(codestring.getSequenceStorage());
+            byte[] lnotabBytes = toByteArrayNode.execute(lnotab.getSequenceStorage());
+
             return factory().createCode(cls, argcount, kwonlyargcount,
                             nlocals, stacksize, flags,
-                            toString(getByteArray(codestring)), constants, names,
+                            codeBytes, constants.getArray(), names.getArray(),
                             varnames.getArray(), freevars.getArray(), cellvars.getArray(),
                             filename.getValue(), name.getValue(), firstlineno,
-                            lnotab);
+                            lnotabBytes);
         }
 
         @SuppressWarnings("unused")
@@ -1884,20 +1886,12 @@ Object call(Object cls, Object argcount, Object kwonlyargcount,
                         Object varnames, Object freevars, Object cellvars,
                         Object filename, Object name, Object firstlineno,
                         Object lnotab) {
-            throw raise(PythonErrorType.NotImplementedError, "code object instance from generic arguments");
+            throw raise(SystemError, "bad argument to internal function");
         }
 
         @TruffleBoundary
-        private static String toString(byte[] data) {
-            return new String(data);
-        }
-
-        private byte[] getByteArray(PIBytesLike pByteArray) {
-            if (toByteArrayNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                toByteArrayNode = insert(SequenceStorageNodes.ToByteArrayNode.create());
-            }
-            return toByteArrayNode.execute(pByteArray.getSequenceStorage());
+        private static byte[] toBytes(String data) {
+            return data.getBytes();
         }
     }
 

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

@@ -33,7 +33,6 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -160,26 +159,41 @@ protected Object get(PCode self) {
     @GenerateNodeFactory
     public abstract static class GetCodeNode extends PythonBuiltinNode {
         @Specialization
-        protected Object get(@SuppressWarnings("unused") PCode self) {
-            return PNotImplemented.NOT_IMPLEMENTED;
+        protected Object get(PCode self) {
+            byte[] codestring = self.getCodestring();
+            if (codestring == null) {
+                // TODO: this is for the moment undefined
+                codestring = new byte[0];
+            }
+            return factory().createBytes(codestring);
         }
     }
 
     @Builtin(name = "co_consts", fixedNumOfPositionalArgs = 1, isGetter = true)
     @GenerateNodeFactory
     public abstract static class GetConstsNode extends PythonBuiltinNode {
         @Specialization
-        protected Object get(@SuppressWarnings("unused") PCode self) {
-            return PNotImplemented.NOT_IMPLEMENTED;
+        protected Object get(PCode self) {
+            Object[] constants = self.getConstants();
+            if (constants == null) {
+                // TODO: this is for the moment undefined (see co_code)
+                constants = new Object[0];
+            }
+            return factory().createTuple(constants);
         }
     }
 
     @Builtin(name = "co_names", fixedNumOfPositionalArgs = 1, isGetter = true)
     @GenerateNodeFactory
     public abstract static class GetNamesNode extends PythonBuiltinNode {
         @Specialization
-        protected Object get(@SuppressWarnings("unused") PCode self) {
-            return PNotImplemented.NOT_IMPLEMENTED;
+        protected Object get(PCode self) {
+            Object[] names = self.getNames();
+            if (names == null) {
+                // TODO: this is for the moment undefined (see co_code)
+                names = new Object[0];
+            }
+            return factory().createTuple(names);
         }
     }
 
@@ -200,8 +214,13 @@ protected Object get(PCode self) {
     @GenerateNodeFactory
     public abstract static class GetLNoTabNode extends PythonBuiltinNode {
         @Specialization
-        protected Object get(@SuppressWarnings("unused") PCode self) {
-            return PNotImplemented.NOT_IMPLEMENTED;
+        protected Object get(PCode self) {
+            byte[] lnotab = self.getLnotab();
+            if (lnotab == null) {
+                // TODO: this is for the moment undefined (see co_code)
+                lnotab = new byte[0];
+            }
+            return factory().createBytes(lnotab);
         }
     }
 }

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

@@ -89,11 +89,11 @@ public class PCode extends PythonBuiltinObject {
     // set if the function is a generator.
     private int flags = -1;
     // is a string representing the sequence of bytecode instructions
-    private String codestring;
+    private byte[] codestring;
     // tuple of constants used in the bytecode
-    private Object constants;
+    private Object[] constants;
     // tuple containing the literals used by the bytecode
-    private Object names;
+    private Object[] names;
     // is a tuple containing the names of the local variables (starting with the argument names)
     private Object[] varnames;
     // name of file in which this code object was created
@@ -103,7 +103,7 @@ public class PCode extends PythonBuiltinObject {
     // number of first line in Python source code
     private int firstlineno = -1;
     // is a string encoding the mapping from bytecode offsets to line numbers
-    private Object lnotab;
+    private byte[] lnotab;
     // tuple of names of free variables (referenced via a function’s closure)
     private Object[] freevars;
     // tuple of names of cell variables (referenced by containing scopes)
@@ -122,10 +122,10 @@ public PCode(PythonClass cls, RootNode rootNode, PythonCore core) {
 
     public PCode(PythonClass cls, int argcount, int kwonlyargcount,
                     int nlocals, int stacksize, int flags,
-                    String codestring, Object constants, Object names,
+                    byte[] codestring, Object[] constants, Object[] names,
                     Object[] varnames, Object[] freevars, Object[] cellvars,
                     String filename, String name, int firstlineno,
-                    Object lnotab) {
+                    byte[] lnotab) {
         super(cls);
         this.rootNode = null;
         this.core = null;
@@ -366,7 +366,7 @@ public int getStacksize() {
         return stacksize;
     }
 
-    public long getFlags() {
+    public int getFlags() {
         if (flags == -1 && rootNode != null) {
             extractArgStats();
         }
@@ -380,19 +380,19 @@ public Object[] getVarnames() {
         return varnames;
     }
 
-    public String getCodestring() {
+    public byte[] getCodestring() {
         return codestring;
     }
 
-    public Object getConstants() {
+    public Object[] getConstants() {
         return constants;
     }
 
-    public Object getNames() {
+    public Object[] getNames() {
         return names;
     }
 
-    public Object getLnotab() {
+    public byte[] getLnotab() {
         return lnotab;
     }
 

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

@@ -723,10 +723,10 @@ public PCode createCode(RootNode result) {
 
     public PCode createCode(PythonClass cls, int argcount, int kwonlyargcount,
                     int nlocals, int stacksize, int flags,
-                    String codestring, Object constants, Object names,
+                    byte[] codestring, Object[] constants, Object[] names,
                     Object[] varnames, Object[] freevars, Object[] cellvars,
                     String filename, String name, int firstlineno,
-                    Object lnotab) {
+                    byte[] lnotab) {
         return trace(new PCode(cls, argcount, kwonlyargcount,
                         nlocals, stacksize, flags,
                         codestring, constants, names,