Move ReleaseNode.check* mehtods to PMemoryView

Author: fangerer

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

@@ -40,7 +40,6 @@
  */
 package com.oracle.graal.python.builtins.objects.memoryview;
 
-import static com.oracle.graal.python.builtins.PythonBuiltinClassType.BufferError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.IndexError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.NotImplementedError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.OverflowError;
@@ -727,34 +726,20 @@ public abstract static class ReleaseNode extends PNodeWithContext {
         @Specialization(guards = "self.getReference() == null")
         static void releaseSimple(PMemoryView self,
                         @Shared("raise") @Cached PRaiseNode raiseNode) {
-            checkExports(raiseNode, self);
+            self.checkExports(raiseNode);
             self.setReleased();
         }
 
         @Specialization(guards = {"self.getReference() != null"})
         static void releaseNative(PMemoryView self,
                         @Cached ReleaseBufferNode releaseNode,
                         @Shared("raise") @Cached PRaiseNode raiseNode) {
-            checkExports(raiseNode, self);
-            if (checkShouldReleaseBuffer(self)) {
+            self.checkExports(raiseNode);
+            if (self.checkShouldReleaseBuffer()) {
                 releaseNode.execute(self.getLifecycleManager());
             }
             self.setReleased();
         }
-
-        private static boolean checkShouldReleaseBuffer(PMemoryView self) {
-            if (self.getReference() != null) {
-                return self.getReference().getLifecycleManager().decrementExports() == 0;
-            }
-            return false;
-        }
-
-        private static void checkExports(PRaiseNode node, PMemoryView self) {
-            long exports = self.getExports().get();
-            if (exports > 0) {
-                throw node.raise(BufferError, ErrorMessages.MEMORYVIEW_HAS_D_EXPORTED_BUFFERS, exports);
-            }
-        }
     }
 
     @GenerateUncached

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

@@ -240,12 +240,26 @@ public void setShouldReleaseImmediately(boolean shouldReleaseImmediately) {
         this.shouldReleaseImmediately = shouldReleaseImmediately;
     }
 
-    public void checkReleased(PRaiseNode raiseNode) {
+    void checkReleased(PRaiseNode raiseNode) {
         if (isReleased()) {
             throw raiseNode.raise(ValueError, ErrorMessages.MEMORYVIEW_FORBIDDEN_RELEASED);
         }
     }
 
+    boolean checkShouldReleaseBuffer() {
+        if (getReference() != null) {
+            return getReference().getLifecycleManager().decrementExports() == 0;
+        }
+        return false;
+    }
+
+    void checkExports(PRaiseNode node) {
+        long exports = getExports().get();
+        if (exports > 0) {
+            throw node.raise(BufferError, ErrorMessages.MEMORYVIEW_HAS_D_EXPORTED_BUFFERS, exports);
+        }
+    }
+
     public void checkReleased(PNodeWithRaise node) {
         if (isReleased()) {
             throw node.raise(ValueError, ErrorMessages.MEMORYVIEW_FORBIDDEN_RELEASED);