[GR-27098] Do not reference run-time objects in C ext root nodes.

PullRequest: graalpython/1367

Author: fangerer

graalpython/com.oracle.graal.python.cext/include/Python.h

@@ -80,6 +80,7 @@
 #include "modsupport.h"
 #include "tupleobject.h"
 #include "structseq.h"
+#include "namespaceobject.h"
 #include "structmember.h"
 #include "pytime.h"
 #include "pymem.h"

graalpython/com.oracle.graal.python.cext/include/namespaceobject.h

@@ -0,0 +1,24 @@
+/* Copyright (c) 2020, Oracle and/or its affiliates.
+ * Copyright (C) 1996-2020 Python Software Foundation
+ *
+ * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ */
+
+/* simple namespace object interface */
+
+#ifndef NAMESPACEOBJECT_H
+#define NAMESPACEOBJECT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_LIMITED_API
+PyAPI_DATA(PyTypeObject) _PyNamespace_Type;
+
+PyAPI_FUNC(PyObject *) _PyNamespace_New(PyObject *kwds);
+#endif /* !Py_LIMITED_API */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* !NAMESPACEOBJECT_H */

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

@@ -121,9 +121,9 @@ PyObject* PyTruffle_MemoryViewFromObject(PyObject *v) {
                 polyglot_from_string(buffer->format ? buffer->format : "B", "ascii"),
                 buffer->ndim,
                 polyglot_from_i8_array(buffer->buf, buffer->len),
-                buffer->shape ? polyglot_from_size_array(buffer->shape, ndim) : NULL,
-                buffer->strides ? polyglot_from_size_array(buffer->strides, ndim) : NULL,
-                buffer->suboffsets ? polyglot_from_size_array(buffer->suboffsets, ndim) : NULL);
+                buffer->shape ? polyglot_from_size_array((int64_t*)buffer->shape, ndim) : NULL,
+                buffer->strides ? polyglot_from_size_array((int64_t*)buffer->strides, ndim) : NULL,
+                buffer->suboffsets ? polyglot_from_size_array((int64_t*)buffer->suboffsets, ndim) : NULL);
         if (!needs_release) {
             free(buffer);
         }
@@ -164,9 +164,9 @@ PyObject* PyMemoryView_FromBuffer(Py_buffer *buffer) {
             polyglot_from_string(buffer->format ? buffer->format : "B", "ascii"),
             buffer->ndim,
             polyglot_from_i8_array(buffer->buf, buffer->len),
-            buffer->shape ? polyglot_from_size_array(buffer->shape, ndim) : NULL,
-            buffer->strides ? polyglot_from_size_array(buffer->strides, ndim) : NULL,
-            buffer->suboffsets ? polyglot_from_size_array(buffer->suboffsets, ndim) : NULL);
+            buffer->shape ? polyglot_from_size_array((int64_t*)buffer->shape, ndim) : NULL,
+            buffer->strides ? polyglot_from_size_array((int64_t*)buffer->strides, ndim) : NULL,
+            buffer->suboffsets ? polyglot_from_size_array((int64_t*)buffer->suboffsets, ndim) : NULL);
 }
 
 PyObject *PyMemoryView_FromMemory(char *mem, Py_ssize_t size, int flags) {

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "capi.h"
+
+typedef struct {
+    PyObject_HEAD
+    PyObject *ns_dict;
+} _PyNamespaceObject;
+
+PyTypeObject _PyNamespace_Type = PY_TRUFFLE_TYPE("SimpleNamespace", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, sizeof(_PyNamespaceObject));
+
+UPCALL_ID(_PyNamespace_New);
+PyObject *
+_PyNamespace_New(PyObject *kwds) {
+	return UPCALL_CEXT_O(_jls__PyNamespace_New, native_to_java(kwds));
+}

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

@@ -201,6 +201,7 @@ def file_not_empty(path):
 static PyObject* test_{capifunction}(PyObject* module, PyObject* args) {{
     PyObject* ___arg;
     {argumentdeclarations};
+#ifndef NOARGS
     if (!PyArg_ParseTuple(args, "O", &___arg)) {{
         return NULL;
     }}
@@ -214,6 +215,7 @@ def file_not_empty(path):
     else {{
         {singleargumentname} = ___arg;
     }}
+#endif
 #endif
     {callfunction}({argumentnames});
     return Py_BuildValue("{resultspec}", {resultval});

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

@@ -393,6 +393,7 @@ def compile_module(self, name):
         }
         """,
         resultspec="O",
+        arguments=[],
         callfunction="wrap_PyErr_Fetch_tb_from_c",
         cmpfunc=compare_tracebacks,
     )

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

@@ -167,9 +167,16 @@ def f24(*args, a, b=5):
 def f25(*args, a, b=5, **kwds):
     pass
 
+
 def f26(**kw):
     return kw
 
+
+class F27:
+    def f27(*args, a=5):
+        return (args, a)
+
+
 def assert_parses(call_expr):
     raised = False
     try:
@@ -362,3 +369,11 @@ def test_runtime_args():
     kw = f26(b = mydict.pop('b', 22), **mydict)
     assert 'b' in kw
     assert kw['b'] == 2
+    
+    f27_object = F27()
+    assert f27_object.f27() == ((f27_object,), 5)
+    assert f27_object.f27(1,2,3) == ((f27_object,1,2,3), 5)
+    assert f27_object.f27(1,2,3,a=10) == ((f27_object,1,2,3), 10)
+    assert F27.f27() == (tuple(), 5)
+    assert F27.f27(1,2,3) == ((1,2,3), 5)
+    assert F27.f27(1,2,3,a=10) == ((1,2,3), 10)