Pass frame to MemoryViewBuiltins.ReleaseNode for indirect call setup

Author: fangerer

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

@@ -226,10 +226,10 @@ Object setitem(VirtualFrame frame, PMemoryView self, PSlice slice, Object object
                     }
                     return PNone.NONE;
                 } finally {
-                    releaseNode.execute(destView);
+                    releaseNode.execute(frame, destView);
                 }
             } finally {
-                releaseNode.execute(srcView);
+                releaseNode.execute(frame, srcView);
             }
         }
 
@@ -312,7 +312,7 @@ Object eq(VirtualFrame frame, PMemoryView self, Object other,
             try {
                 return eq(frame, self, memoryView, eqNode, readSelf, readOther);
             } finally {
-                releaseNode.execute(memoryView);
+                releaseNode.execute(frame, memoryView);
             }
         }
 
@@ -699,9 +699,9 @@ Object enter(PMemoryView self) {
     public abstract static class ExitNode extends PythonQuaternaryBuiltinNode {
         @Specialization
         @SuppressWarnings("unused")
-        static Object exit(PMemoryView self, Object type, Object val, Object tb,
+        static Object exit(VirtualFrame frame, PMemoryView self, Object type, Object val, Object tb,
                         @Cached MemoryViewNodes.ReleaseNode releaseNode) {
-            releaseNode.execute(self);
+            releaseNode.execute(frame, self);
             return PNone.NONE;
         }
     }
@@ -710,9 +710,9 @@ static Object exit(PMemoryView self, Object type, Object val, Object tb,
     @GenerateNodeFactory
     public abstract static class ReleaseNode extends PythonUnaryBuiltinNode {
         @Specialization
-        Object release(PMemoryView self,
+        Object release(VirtualFrame frame, PMemoryView self,
                         @Cached MemoryViewNodes.ReleaseNode releaseNode) {
-            releaseNode.execute(self);
+            releaseNode.execute(frame, self);
             return PNone.NONE;
         }
     }

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

@@ -46,7 +46,6 @@
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ValueError;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAccessLibrary;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
@@ -62,11 +61,10 @@
 import com.oracle.graal.python.lib.PyNumberAsSizeNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
-import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PNodeWithRaise;
+import com.oracle.graal.python.nodes.PNodeWithRaiseAndIndirectCall;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.util.CastToByteNode;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
@@ -719,9 +717,13 @@ public static ToJavaBytesFortranOrderNode create() {
         }
     }
 
-    @GenerateUncached
-    public abstract static class ReleaseNode extends PNodeWithContext {
-        public abstract void execute(PMemoryView self);
+    public abstract static class ReleaseNode extends PNodeWithRaiseAndIndirectCall {
+
+        public final void execute(PMemoryView self) {
+            execute(null, self);
+        }
+
+        public abstract void execute(VirtualFrame frame, PMemoryView self);
 
         @Specialization(guards = "self.getReference() == null")
         static void releaseSimple(PMemoryView self,
@@ -731,12 +733,12 @@ static void releaseSimple(PMemoryView self,
         }
 
         @Specialization(guards = {"self.getReference() != null"})
-        static void releaseNative(PMemoryView self,
+        void releaseNative(VirtualFrame frame, PMemoryView self,
                         @Cached ReleaseBufferNode releaseNode,
                         @Shared("raise") @Cached PRaiseNode raiseNode) {
             self.checkExports(raiseNode);
             if (self.checkShouldReleaseBuffer()) {
-                releaseNode.execute(self.getLifecycleManager());
+                releaseNode.execute(frame, this, self.getLifecycleManager());
             }
             self.setReleased();
         }
@@ -747,12 +749,12 @@ public abstract static class ReleaseBufferNode extends Node {
 
         public abstract void execute(BufferLifecycleManager buffer);
 
-        public final void execute(VirtualFrame frame, PythonLanguage language, PythonBuiltinBaseNode caller, BufferLifecycleManager buffer) {
-            Object state = IndirectCallContext.enter(frame, language, caller.getContext(), caller);
+        public final void execute(VirtualFrame frame, PNodeWithRaiseAndIndirectCall caller, BufferLifecycleManager buffer) {
+            Object state = IndirectCallContext.enter(frame, caller);
             try {
                 execute(buffer);
             } finally {
-                IndirectCallContext.exit(frame, language, caller.getContext(), state);
+                IndirectCallContext.exit(frame, caller, state);
             }
         }
 

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

@@ -48,6 +48,7 @@
 import com.oracle.graal.python.builtins.objects.buffer.BufferFlags;
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAccessLibrary;
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAcquireLibrary;
+import com.oracle.graal.python.builtins.objects.memoryview.MemoryViewNodes.ReleaseBufferNode;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PNodeWithRaise;
@@ -315,14 +316,19 @@ Object acquire(int requestedFlags,
 
     @ExportMessage
     void release(
-                    @Cached MemoryViewNodes.ReleaseNode releaseNode) {
+                    @Cached PRaiseNode raiseNode,
+                    @Cached ReleaseBufferNode releaseNode) {
         /*
          * This is a bit hacky - the shouldReleaseImmediately marker is used when this is a helper
          * memoryview that was created to hold a buffer for native object. In the future there
          * should be no such helper memoryviews, the C buffer should have a separate implementation.
          */
         if (shouldReleaseImmediately) {
-            releaseNode.execute(this);
+            checkExports(raiseNode);
+            if (checkShouldReleaseBuffer()) {
+                releaseNode.execute(getLifecycleManager());
+            }
+            setReleased();
         } else {
             long l = exports.decrementAndGet();
             assert l >= 0;