[GR-13396] fix code constructor

PullRequest: graalpython/362

Author: cosminbasca

graalpython/com.oracle.graal.python.cext/src/codeobject.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -52,7 +52,6 @@ PyCodeObject* PyCode_New(int argcount, int kwonlyargcount,
     return UPCALL_CEXT_O(_jls_PyCode_New, argcount, kwonlyargcount,
                          nlocals, stacksize, flags,
                          native_to_java(code), native_to_java(consts), native_to_java(names),
-                         native_to_java(varnames), native_to_java(freevars), native_to_java(cellvars),
-                         native_to_java(filename), native_to_java(name), firstlineno,
-                         native_to_java(lnotab));
+                         native_to_java(varnames), native_to_java(filename), native_to_java(name), firstlineno,
+                         native_to_java(lnotab), native_to_java(freevars), native_to_java(cellvars));
 }

graalpython/com.oracle.graal.python.test/src/tests/test_code.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, 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
@@ -95,3 +95,41 @@ def test_code_attributes():
     # assert code.co_lnotab == b'\x00\x01\x0c\x01\x0c\x01\x06\x02\x15\x03\x03\x01\x0e\x01\r\x01\x05\x02'
     assert set(code.co_freevars) == {'values'}
     assert set(code.co_cellvars) == {'kwarg_other', 'loc_2'}
+
+
+def test_code_copy():
+    import types
+
+    code = wrapper().__code__
+    code2 = types.CodeType(
+        code.co_argcount,
+        code.co_kwonlyargcount,
+        code.co_nlocals,
+        code.co_stacksize,
+        code.co_flags,
+        code.co_code,
+        code.co_consts,
+        code.co_names,
+        code.co_varnames,
+        code.co_filename,
+        code.co_name,
+        code.co_firstlineno,
+        code.co_lnotab,
+        code.co_freevars,
+        code.co_cellvars)
+
+    assert code.co_argcount == code2.co_argcount
+    assert code.co_kwonlyargcount == code2.co_kwonlyargcount
+    assert code.co_nlocals == code2.co_nlocals
+    assert code.co_stacksize == code2.co_stacksize
+    assert code.co_flags == code2.co_flags
+    assert code.co_code == code2.co_code
+    assert code.co_consts == code2.co_consts
+    assert set(code.co_names) == set(code2.co_names)
+    assert set(code.co_varnames) == set(code2.co_varnames)
+    assert code.co_filename == code2.co_filename
+    assert code.co_name == code2.co_name
+    assert code.co_firstlineno == code2.co_firstlineno
+    assert code.co_lnotab == code2.co_lnotab
+    assert set(code.co_freevars) == set(code2.co_freevars)
+    assert set(code.co_cellvars) == set(code2.co_cellvars)

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

@@ -2341,9 +2341,9 @@ public abstract static class CodeTypeNode extends PythonBuiltinNode {
         Object call(PythonClass cls, int argcount, int kwonlyargcount,
                         int nlocals, int stacksize, int flags,
                         String codestring, PTuple constants, PTuple names,
-                        PTuple varnames, PTuple freevars, PTuple cellvars,
-                        Object filename, Object name, int firstlineno,
-                        String lnotab) {
+                        PTuple varnames, Object filename, Object name,
+                        int firstlineno, String lnotab,
+                        PTuple freevars, PTuple cellvars) {
             return factory().createCode(cls, argcount, kwonlyargcount,
                             nlocals, stacksize, flags,
                             toBytes(codestring), constants.getArray(), names.getArray(),
@@ -2356,9 +2356,9 @@ Object call(PythonClass cls, int argcount, int kwonlyargcount,
         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,
-                        Object filename, Object name, int firstlineno,
-                        PBytes lnotab,
+                        PTuple varnames, Object filename, Object name,
+                        int firstlineno, PBytes lnotab,
+                        PTuple freevars, PTuple cellvars,
                         @Cached("create()") SequenceStorageNodes.ToByteArrayNode toByteArrayNode) {
             byte[] codeBytes = toByteArrayNode.execute(codestring.getSequenceStorage());
             byte[] lnotabBytes = toByteArrayNode.execute(lnotab.getSequenceStorage());
@@ -2376,9 +2376,9 @@ Object call(PythonClass cls, int argcount, int kwonlyargcount,
         Object call(Object cls, Object argcount, Object kwonlyargcount,
                         Object nlocals, Object stacksize, Object flags,
                         Object codestring, Object constants, Object names,
-                        Object varnames, Object freevars, Object cellvars,
-                        Object filename, Object name, Object firstlineno,
-                        Object lnotab) {
+                        Object varnames, Object filename, Object name,
+                        Object firstlineno, Object lnotab,
+                        Object freevars, Object cellvars) {
             throw raise(SystemError, "bad argument to internal function");
         }