Add missing exception transformation to memoryview upcalls

Author: msimacek

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

@@ -108,6 +108,38 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare_with_message,
     )
 
+    test_memoryview_fromobject = CPyExtFunction(
+        lambda args: args[2],
+        lambda: (
+            (b'123', 2, ord('3')),
+            (bytearray(b'123'), 2, ord('3')),
+            (memoryview(bytearray(b'123')), 2, ord('3')),
+            ([1, 2, 3], 0, TypeError("memoryview: a bytes-like object is required, not 'list'")),
+            # This tests that exceptions are properly converted on C boundary
+            (None, 0, None),
+        ),
+        code='''
+            static PyObject* test_fromobject(PyObject *object, PyObject *key, PyObject* expected) {
+                PyObject *mv = PyMemoryView_FromObject(object);
+                if (!mv) {
+                    if (object == Py_None) {
+                        PyErr_Clear();
+                        Py_RETURN_NONE;
+                    }
+                    return NULL;
+                }
+                PyObject *item = PyObject_GetItem(mv, key);
+                Py_DECREF(mv);
+                return item;
+            }
+        ''',
+        resultspec='O',
+        argspec='OOO',
+        arguments=["PyObject* object", "PyObject* key", "PyObject* expected"],
+        callfunction="test_fromobject",
+        cmpfunc=unhandled_error_compare_with_message,
+    )
+
     test_memoryview_tolist = CPyExtFunction(
         lambda args: args[0],
         lambda: [

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

@@ -1550,33 +1550,40 @@ Object doPythonObject(PythonManagedClass obj, Object getBufferProc, Object relea
     @GenerateNodeFactory
     abstract static class PyTruffle_MemoryViewFromObject extends NativeBuiltin {
         @Specialization
-        static Object wrap(Object object,
-                        @Cached AsPythonObjectNode asPythonObjectNode,
+        Object wrap(VirtualFrame frame, Object object,
                         @Cached BuiltinConstructors.MemoryViewNode memoryViewNode,
-                        @Cached ToNewRefNode toNewRefNode) {
-            return toNewRefNode.execute(memoryViewNode.create(asPythonObjectNode.execute(object)));
+                        @Cached GetNativeNullNode getNativeNullNode) {
+            try {
+                return memoryViewNode.create(object);
+            } catch (PException e) {
+                transformToNative(frame, e);
+                return getNativeNullNode.execute();
+            }
         }
     }
 
+    // Called without landing node
     @Builtin(name = NativeCAPISymbols.FUN_PY_TRUFFLE_MEMORYVIEW_FROM_BUFFER, minNumOfPositionalArgs = 12)
     @GenerateNodeFactory
     abstract static class PyTruffle_MemoryViewFromBuffer extends NativeBuiltin {
 
         @Specialization
-        static Object wrap(Object bufferStructPointer, Object ownerObj, Object releasefn, Object lenObj, Object readonlyObj, Object itemsizeObj, Object formatObj,
+        Object wrap(VirtualFrame frame, Object bufferStructPointer, Object ownerObj, Object releasefn, Object lenObj,
+                        Object readonlyObj, Object itemsizeObj, Object formatObj,
                         Object ndimObj, Object bufPointer, Object shapePointer, Object stridesPointer, Object suboffsetsPointer,
                         @Cached MemoryViewNodes.InitFlagsNode initFlagsNode,
                         @CachedLibrary(limit = "1") InteropLibrary lib,
                         @Cached CastToJavaIntExactNode castToIntNode,
                         @Cached AsPythonObjectNode asPythonObjectNode,
-                        @Cached ToNewRefNode toNewRefNode) {
-            int ndim = castToIntNode.execute(ndimObj);
-            int itemsize = castToIntNode.execute(itemsizeObj);
-            int len = castToIntNode.execute(lenObj);
-            boolean readonly = castToIntNode.execute(readonlyObj) != 0;
-            String format = (String) asPythonObjectNode.execute(formatObj);
-            Object owner = lib.isNull(ownerObj) ? null : asPythonObjectNode.execute(ownerObj);
+                        @Cached ToNewRefNode toNewRefNode,
+                        @Cached GetNativeNullNode getNativeNullNode) {
             try {
+                int ndim = castToIntNode.execute(ndimObj);
+                int itemsize = castToIntNode.execute(itemsizeObj);
+                int len = castToIntNode.execute(lenObj);
+                boolean readonly = castToIntNode.execute(readonlyObj) != 0;
+                String format = (String) asPythonObjectNode.execute(formatObj);
+                Object owner = lib.isNull(ownerObj) ? null : asPythonObjectNode.execute(ownerObj);
                 int[] shape = null;
                 int[] strides = null;
                 int[] suboffsets = null;
@@ -1617,6 +1624,9 @@ static Object wrap(Object bufferStructPointer, Object ownerObj, Object releasefn
                                 PythonBuiltinClassType.PMemoryView.getInstanceShape(),
                                 managedBuffer, owner, len, readonly, itemsize, format, ndim, bufPointer, 0, shape, strides, suboffsets, flags);
                 return toNewRefNode.execute(memoryview);
+            } catch (PException e) {
+                transformToNative(frame, e);
+                return toNewRefNode.execute(getNativeNullNode.execute());
             } catch (UnsupportedMessageException | InvalidArrayIndexException e) {
                 throw CompilerDirectives.shouldNotReachHere(e);
             }