Fix propagating exception from memoryview constructor on native objects

Author: msimacek

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

@@ -27,6 +27,7 @@
 
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_ADD_NATIVE_SLOTS;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_PY_OBJECT_NEW;
+import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols.FUN_PY_TRUFFLE_MEMORYVIEW_FROM_OBJECT;
 import static com.oracle.graal.python.builtins.objects.range.RangeUtils.canBeInt;
 import static com.oracle.graal.python.builtins.objects.range.RangeUtils.canBePint;
 import static com.oracle.graal.python.builtins.objects.type.TypeBuiltins.TYPE_ITEMSIZE;
@@ -121,7 +122,6 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory;
-import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbols;
 import com.oracle.graal.python.builtins.objects.code.CodeNodes;
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes;
@@ -3321,10 +3321,10 @@ public boolean hasSetItem(Object object) {
     @Builtin(name = MEMORYVIEW, minNumOfPositionalArgs = 2, parameterNames = {"$cls", "object"}, constructsClass = PythonBuiltinClassType.PMemoryView)
     @GenerateNodeFactory
     public abstract static class MemoryViewNode extends PythonBuiltinNode {
-        public abstract PMemoryView execute(Object cls, Object object);
+        public abstract PMemoryView execute(VirtualFrame frame, Object cls, Object object);
 
-        public final PMemoryView execute(Object object) {
-            return execute(PythonBuiltinClassType.PMemoryView, object);
+        public final PMemoryView execute(VirtualFrame frame, Object object) {
+            return execute(frame, PythonBuiltinClassType.PMemoryView, object);
         }
 
         // TODO arrays should support buffer protocol too, but their implementation would be
@@ -3358,11 +3358,20 @@ PMemoryView fromMemoryView(@SuppressWarnings("unused") Object cls, PMemoryView o
         }
 
         @Specialization
-        static PMemoryView fromNative(@SuppressWarnings("unused") Object cls, PythonAbstractNativeObject object,
+        PMemoryView fromNative(VirtualFrame frame, @SuppressWarnings("unused") Object cls, PythonAbstractNativeObject object,
+                        @Cached ForeignCallContext foreignCallContext,
                         @Cached CExtNodes.ToSulongNode toSulongNode,
                         @Cached CExtNodes.AsPythonObjectNode asPythonObjectNode,
-                        @Cached PCallCapiFunction callCapiFunction) {
-            return (PMemoryView) asPythonObjectNode.execute(callCapiFunction.call(NativeCAPISymbols.FUN_PY_TRUFFLE_MEMORYVIEW_FROM_OBJECT, toSulongNode.execute(object)));
+                        @Cached PCallCapiFunction callCapiFunction,
+                        @Cached PythonCextBuiltins.DefaultCheckFunctionResultNode checkFunctionResultNode) {
+            Object state = foreignCallContext.enter(frame, getContext(), this);
+            try {
+                Object result = callCapiFunction.call(FUN_PY_TRUFFLE_MEMORYVIEW_FROM_OBJECT, toSulongNode.execute(object));
+                checkFunctionResultNode.execute(FUN_PY_TRUFFLE_MEMORYVIEW_FROM_OBJECT, result);
+                return (PMemoryView) asPythonObjectNode.execute(result);
+            } finally {
+                foreignCallContext.exit(frame, getContext(), state);
+            }
         }
 
         @Fallback

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

@@ -1554,7 +1554,7 @@ Object wrap(VirtualFrame frame, Object object,
                         @Cached BuiltinConstructors.MemoryViewNode memoryViewNode,
                         @Cached GetNativeNullNode getNativeNullNode) {
             try {
-                return memoryViewNode.execute(object);
+                return memoryViewNode.execute(frame, object);
             } catch (PException e) {
                 transformToNative(frame, e);
                 return getNativeNullNode.execute();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewBuiltins.java

@@ -90,7 +90,7 @@
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.subscript.SliceLiteralNode;
 import com.oracle.graal.python.runtime.AsyncHandler;
-import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
+import com.oracle.graal.python.runtime.ExecutionContext;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -254,7 +254,7 @@ Object setitem(VirtualFrame frame, PMemoryView self, PSlice slice, Object object
             if (self.getDimensions() != 1) {
                 throw raise(NotImplementedError, ErrorMessages.MEMORYVIEW_SLICE_ASSIGNMENT_RESTRICTED_TO_DIM_1);
             }
-            PMemoryView srcView = createMemoryView.execute(object);
+            PMemoryView srcView = createMemoryView.execute(frame, object);
             PMemoryView destView = (PMemoryView) getItemNode.execute(frame, self, slice);
             if (srcView.getDimensions() != destView.getDimensions() || srcView.getBufferShape()[0] != destView.getBufferShape()[0] || srcView.getFormat() != destView.getFormat()) {
                 throw raise(ValueError, ErrorMessages.MEMORYVIEW_DIFFERENT_STRUCTURES);
@@ -341,7 +341,7 @@ Object eq(VirtualFrame frame, PMemoryView self, Object other,
                         @Cached MemoryViewNodes.ReadItemAtNode readOther) {
             PMemoryView memoryView;
             try {
-                memoryView = memoryViewNode.execute(other);
+                memoryView = memoryViewNode.execute(frame, other);
             } catch (PException e) {
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
@@ -762,15 +762,16 @@ Object releaseManaged(PMemoryView self,
 
         @Specialization(guards = {"self.getReference() != null", "self.getManagedBuffer().isForNative()"})
         Object releaseNative(VirtualFrame frame, PMemoryView self,
+                        @Cached ExecutionContext.ForeignCallContext foreignCallContext,
                         @Cached CExtNodes.PCallCapiFunction callRelease) {
             checkExports(self);
             if (checkShouldReleaseBuffer(self)) {
-                Object state = IndirectCallContext.enter(frame, getContext(), this);
+                Object state = foreignCallContext.enter(frame, getContext(), this);
                 ManagedBuffer buffer = self.getManagedBuffer();
                 try {
                     callRelease.call(NativeCAPISymbols.FUN_PY_TRUFFLE_RELEASE_BUFFER, buffer.getBufferStructPointer());
                 } finally {
-                    IndirectCallContext.exit(frame, getContext(), state);
+                    foreignCallContext.exit(frame, getContext(), state);
                 }
             }
             self.setReleased();