marshal: serialize minimal PCode information

- style fixes

Author: cosminbasca

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

@@ -436,16 +436,8 @@ void handlePCode(@SuppressWarnings("unused") VirtualFrame frame, PCode c, int ve
             writeByte(TYPE_CODE, version, buffer);
             writeString(getSourceCode(c), version, buffer);
             writeString(c.getFilename(), version, buffer);
-            writeString(c.getName(), version, buffer);
-            writeInt(c.getNlocals(), version, buffer);
-            writeInt(c.getStacksize(), version, buffer);
             writeInt(c.getFlags(), version, buffer);
             writeBytes(c.getCodestring(), version, buffer);
-            writeArray(frame, c.getConstants(), version, buffer);
-            writeArray(frame, c.getNames(), version, buffer);
-            writeArray(frame, c.getVarnames(), version, buffer);
-            writeArray(frame, c.getFreeVars(), version, buffer);
-            writeArray(frame, c.getCellVars(), version, buffer);
             writeInt(c.getFirstLineNo(), version, buffer);
             writeBytes(c.getLnotab(), version, buffer);
         }
@@ -644,28 +636,16 @@ private PComplex readPComplex() {
             return factory().createComplex(real, imag);
         }
 
-        private PCode readCode(int depth, HashingStorageLibrary lib) {
+        private PCode readCode() {
             String sourceCode = readString();
             String fileName = readInternedString();
-            String name = readString();
-            int nLocals = readInt();
-            int stackSize = readInt();
             int flags = readInt();
             byte[] codeString = readBytes();
-            Object[] constants = readArray(depth, lib);
-            Object[] names = readArray(depth, lib);
-            Object[] varNames = readArray(depth, lib);
-            Object[] freeVars = readArray(depth, lib);
-            Object[] cellVars = readArray(depth, lib);
             int firstLineNo = readInt();
             byte[] lnoTab = readBytes();
 
-            return ensureCreateCodeNode().execute(null, PythonBuiltinClassType.PCode, sourceCode,
-                            nLocals, stackSize, flags,
-                            codeString, constants, names,
-                            varNames, freeVars, cellVars,
-                            fileName, name, firstLineNo,
-                            lnoTab);
+            return ensureCreateCodeNode().execute(null, PythonBuiltinClassType.PCode, sourceCode, flags,
+                            codeString, fileName, firstLineNo, lnoTab);
         }
 
         private PDict readDict(int depth, HashingStorageLibrary lib) {
@@ -774,7 +754,7 @@ private Object readObject(int depth, HashingStorageLibrary lib) {
                 case TYPE_FROZENSET:
                     return readFrozenSet(depth, lib);
                 case TYPE_CODE:
-                    return readCode(depth, lib);
+                    return readCode();
                 case TYPE_COMPLEX:
                     return readPComplex();
                 default:

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

@@ -123,37 +123,24 @@ private PCode createCode(PythonContext context, Object cls, @SuppressWarnings("u
                             firstlineno, lnotab);
         }
 
-        public PCode execute(VirtualFrame frame, Object cls, String sourceCode,
-                        int nlocals, int stacksize, int flags,
-                        byte[] codedata, Object[] constants, Object[] names,
-                        Object[] varnames, Object[] freevars, Object[] cellvars,
-                        String filename, String name, int firstlineno,
-                        byte[] lnotab) {
+        public PCode execute(VirtualFrame frame, @SuppressWarnings("unused") Object cls, String sourceCode, int flags, byte[] codedata, String filename,
+                        int firstlineno, byte[] lnotab) {
             PythonContext context = getContextRef().get();
             Object state = IndirectCallContext.enter(frame, context, this);
             try {
-                return createCode(context, cls, sourceCode,
-                                nlocals, stacksize, flags,
-                                codedata, constants, names,
-                                varnames, freevars, cellvars,
-                                filename, name, firstlineno,
-                                lnotab);
+                return createCode(context, sourceCode, flags, codedata, filename, firstlineno, lnotab);
             } finally {
                 IndirectCallContext.exit(frame, context, state);
             }
         }
 
         @TruffleBoundary
-        private static PCode createCode(PythonContext context, Object cls, String sourceCode,
-                        int nlocals, int stacksize, int flags,
-                        byte[] codedata, Object[] constants, Object[] names,
-                        Object[] varnames, Object[] freevars, Object[] cellvars,
-                        String filename, String name, int firstlineno,
-                        byte[] lnotab) {
+        private static PCode createCode(PythonContext context, String sourceCode, int flags, byte[] codedata, String filename,
+                        int firstlineno, byte[] lnotab) {
             boolean isNotAModule = (flags & PCode.FLAG_MODULE) == 0;
             Source source = PythonLanguage.newSource(context, sourceCode, filename, isNotAModule);
             Supplier<CallTarget> createCode = () -> {
-                RootNode rootNode = context.getCore().getSerializer().deserialize(source, codedata, toStringArray(cellvars), toStringArray(freevars));
+                RootNode rootNode = context.getCore().getSerializer().deserialize(source, codedata);
                 return PythonUtils.getOrCreateCallTarget(rootNode);
             };
 
@@ -164,8 +151,7 @@ private static PCode createCode(PythonContext context, Object cls, String source
                 ct = (RootCallTarget) context.getCore().getLanguage().cacheCode(filename, createCode);
             }
             PythonObjectFactory factory = PythonObjectFactory.getUncached();
-            return factory.createCode(cls, ct, ((PRootNode) ct.getRootNode()).getSignature(), nlocals, stacksize, flags, codedata, constants, names, varnames, freevars, cellvars, filename, name,
-                            firstlineno, lnotab);
+            return factory.createCode(ct, codedata, flags, firstlineno, lnotab);
         }
 
         private ContextReference<PythonContext> getContextRef() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PConstructAndRaiseNode.java

@@ -154,14 +154,14 @@ private static String getMessage(Exception exception) {
         return exception.getMessage();
     }
 
-    private Object[] createOsErrorArgs(OSErrorEnum osErrorEnum, String filename1, String filename2) {
+    private static Object[] createOsErrorArgs(OSErrorEnum osErrorEnum, String filename1, String filename2) {
         return new Object[]{osErrorEnum.getNumber(), osErrorEnum.getMessage(),
                         (filename1 != null) ? filename1 : PNone.NONE,
                         PNone.NONE,
                         (filename2 != null) ? filename2 : PNone.NONE};
     }
 
-    private Object[] createOsErrorArgs(Exception exception, String filename1, String filename2) {
+    private static Object[] createOsErrorArgs(Exception exception, String filename1, String filename2) {
         OSErrorEnum.ErrorAndMessagePair errorAndMessage = OSErrorEnum.fromException(exception);
         return new Object[]{errorAndMessage.oserror.getNumber(), errorAndMessage.message,
                         (filename1 != null) ? filename1 : PNone.NONE,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/sst/DecoratedSSTNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0

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

@@ -827,6 +827,10 @@ public PCode createCode(RootCallTarget ct) {
         return trace(new PCode(PythonBuiltinClassType.PCode, PythonBuiltinClassType.PCode.getInstanceShape(), ct));
     }
 
+    public PCode createCode(RootCallTarget ct, byte[] codestring, int flags, int firstlineno, byte[] lnotab) {
+        return trace(new PCode(PythonBuiltinClassType.PCode, PythonBuiltinClassType.PCode.getInstanceShape(), ct, codestring, flags, firstlineno, lnotab));
+    }
+
     public PCode createCode(Object cls, RootCallTarget callTarget, Signature signature,
                     int nlocals, int stacksize, int flags,
                     byte[] codestring, Object[] constants, Object[] names,