[GR-10941] code object support for co_??? attributes

PullRequest: graalpython/126

Author: cosminbasca

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

@@ -42,15 +42,16 @@
 
 PyTypeObject PyCode_Type = PY_TRUFFLE_TYPE("code", &PyType_Type, Py_TPFLAGS_DEFAULT, sizeof(PyTypeObject));
 
-PyCodeObject* PyCode_New(int argcount, int kwonlyargcount, int nlocals,
-                         int stacksize, int flags, PyObject *code,
-                         PyObject *consts, PyObject *names, PyObject *varnames,
-                         PyObject *freevars, PyObject *cellvars,
+PyCodeObject* PyCode_New(int argcount, int kwonlyargcount,
+                         int nlocals, int stacksize, int flags,
+                         PyObject *code, PyObject *consts, PyObject *names,
+                         PyObject *varnames, PyObject *freevars, PyObject *cellvars,
                          PyObject *filename, PyObject *name, int firstlineno,
                          PyObject *lnotab) {
-    return UPCALL_CEXT_O("PyCode_New", argcount, kwonlyargcount, nlocals,
-                         stacksize, flags, native_to_java(code),
-                         native_to_java(consts), native_to_java(names), native_to_java(varnames),
+    return UPCALL_CEXT_O("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));
 }

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_codeobject.py

@@ -37,9 +37,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import sys
 import types
-from . import CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, GRAALPYTHON
+
+import sys
+
+from . import CPyExtTestCase, CPyExtFunction
+
 __dir__ = __file__.rpartition("/")[0]
 
 
@@ -63,19 +66,23 @@ def compile_module(self, name):
         lambda args: args,
         lambda: (
             (
-                1,2,3,4,0,b"",tuple(),tuple(),tuple(),
-                tuple(),tuple(),"filename","name",1,b"",
+                1, 2,
+                3, 4, 0,
+                b"", tuple(), tuple(),
+                tuple(), tuple(), tuple(),
+                "filename", "name", 1,
+                b"",
             ),
         ),
         resultspec="O",
         argspec="iiiiiOOOOOOOOiO",
         arguments=[
-            "int argcount", "int kwonlyargcount", "int nlocals",
-            "int stacksize", "int flags", "PyObject* code",
-            "PyObject* consts", "PyObject* names", "PyObject* varnames",
-            "PyObject* freevars", "PyObject* cellvars",
+            "int argcount", "int kwonlyargcount",
+            "int nlocals", "int stacksize", "int flags",
+            "PyObject* code", "PyObject* consts", "PyObject* names",
+            "PyObject* varnames", "PyObject* freevars", "PyObject* cellvars",
             "PyObject* filename", "PyObject* name", "int firstlineno",
-            "PyObject* lnotab"
+            "PyObject* lnotab",
         ],
-        cmpfunc=lambda cr,pr: isinstance(cr, types.CodeType),
+        cmpfunc=lambda cr, pr: isinstance(cr, types.CodeType),
     )

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

@@ -37,10 +37,33 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+
 def a_function():
     pass
 
 
+def wrapper():
+    values = []
+
+    def my_func(arg_l, kwarg_case="empty set", kwarg_other=19):
+        loc_1 = set(values)
+        loc_2 = set(values)
+        loc_3 = "set()"
+
+        def inner_func():
+            return kwarg_other + loc_2
+
+        try:
+            loc_1 &= kwarg_other
+            yield loc_1
+        except TypeError:
+            pass
+        else:
+            print("expected TypeError")
+
+    return my_func
+
+
 def test_name():
     assert a_function.__code__.co_name == "a_function"
 
@@ -50,4 +73,25 @@ def test_filename():
 
 
 def test_firstlineno():
-    assert a_function.__code__.co_firstlineno == 40
+    assert a_function.__code__.co_firstlineno == 41
+
+
+def test_code_attributes():
+    code = wrapper().__code__
+    assert code.co_argcount == 3
+    assert code.co_kwonlyargcount == 0
+    assert code.co_nlocals == 6
+    assert code.co_stacksize >= code.co_nlocals
+    assert code.co_flags & (1 << 5)
+    assert not code.co_flags & (1 << 2)
+    assert not code.co_flags & (1 << 3)
+    # assert code.co_code
+    # assert code.co_consts
+    # assert set(code.co_names) == {'set', 'TypeError', 'print'}
+    assert set(code.co_varnames) == {'arg_l', 'kwarg_case', 'kwarg_other', 'loc_1', 'loc_3', 'inner_func'}
+    assert code.co_filename.endswith("test_code.py")
+    assert code.co_name == "my_func"
+    assert code.co_firstlineno == 48
+    # 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'}

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

@@ -1451,34 +1451,44 @@ Object call() {
     @GenerateNodeFactory
     public abstract static class CodeTypeNode extends PythonBuiltinNode {
         @Specialization
-        Object call(PythonClass cls, int argcount, int kwonlyargcount, int nlocals, int stacksize,
-                        int flags, String codestring, Object constants, Object names, Object varnames,
-                        String filename, String name, int firstlineno, Object lnotab, Object freevars,
-                        Object cellvars) {
-            return factory().createCode(cls, argcount, kwonlyargcount, nlocals, stacksize,
-                            flags, codestring, constants, names, varnames,
-                            filename, name, firstlineno, lnotab, freevars,
-                            cellvars);
+        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,
+                        String filename, String name, int firstlineno,
+                        String lnotab) {
+            return factory().createCode(cls, argcount, kwonlyargcount,
+                            nlocals, stacksize, flags,
+                            codestring, constants, names,
+                            varnames.getArray(), freevars.getArray(), cellvars.getArray(),
+                            filename, name, firstlineno,
+                            lnotab);
         }
 
         @Specialization
         @TruffleBoundary
-        Object call(PythonClass cls, int argcount, int kwonlyargcount, int nlocals, int stacksize,
-                        int flags, PBytes codestring, Object constants, Object names, Object varnames,
-                        PString filename, PString name, int firstlineno, Object lnotab, Object freevars,
-                        Object cellvars) {
-            return factory().createCode(cls, argcount, kwonlyargcount, nlocals, stacksize,
-                            flags, new String(codestring.getInternalByteArray()), constants, names, varnames,
-                            filename.getValue(), name.getValue(), firstlineno, lnotab, freevars,
-                            cellvars);
+        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) {
+            return factory().createCode(cls, argcount, kwonlyargcount,
+                            nlocals, stacksize, flags,
+                            new String(codestring.getInternalByteArray()), constants, names,
+                            varnames.getArray(), freevars.getArray(), cellvars.getArray(),
+                            filename.getValue(), name.getValue(), firstlineno,
+                            lnotab);
         }
 
         @SuppressWarnings("unused")
         @Fallback
-        Object call(Object cls, Object argcount, Object kwonlyargcount, Object nlocals, Object stacksize,
-                        Object flags, Object codestring, Object constants, Object names, Object varnames,
-                        Object filename, Object name, Object firstlineno, Object lnotab, Object freevars,
-                        Object cellvars) {
+        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) {
             throw raise(PythonErrorType.NotImplementedError, "code object instance from generic arguments");
         }
     }