Add missing memoryview release calls

Author: msimacek

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

@@ -260,6 +260,7 @@ Object setitem(VirtualFrame frame, PMemoryView self, Object index, Object object
         Object setitem(VirtualFrame frame, PMemoryView self, PSlice slice, Object object,
                         @Cached GetItemNode getItemNode,
                         @Cached BuiltinConstructors.MemoryViewNode createMemoryView,
+                        @Cached ReleaseNode releaseNode,
                         @Cached MemoryViewNodes.PointerLookupNode pointerLookupNode,
                         @Cached MemoryViewNodes.ToJavaBytesNode toJavaBytesNode,
                         @Cached MemoryViewNodes.WriteBytesAtNode writeBytesAtNode) {
@@ -269,19 +270,27 @@ Object setitem(VirtualFrame frame, PMemoryView self, PSlice slice, Object object
                 throw raise(NotImplementedError, ErrorMessages.MEMORYVIEW_SLICE_ASSIGNMENT_RESTRICTED_TO_DIM_1);
             }
             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);
-            }
-            // The intermediate array is necessary for overlapping views (where src and dest are the
-            // same buffer)
-            byte[] srcBytes = toJavaBytesNode.execute(srcView);
-            int itemsize = srcView.getItemSize();
-            for (int i = 0; i < destView.getBufferShape()[0]; i++) {
-                MemoryViewNodes.MemoryPointer destPtr = pointerLookupNode.execute(frame, destView, i);
-                writeBytesAtNode.execute(srcBytes, i * itemsize, itemsize, self, destPtr.ptr, destPtr.offset);
+            try {
+                PMemoryView destView = (PMemoryView) getItemNode.execute(frame, self, slice);
+                try {
+                    if (srcView.getDimensions() != destView.getDimensions() || srcView.getBufferShape()[0] != destView.getBufferShape()[0] || srcView.getFormat() != destView.getFormat()) {
+                        throw raise(ValueError, ErrorMessages.MEMORYVIEW_DIFFERENT_STRUCTURES);
+                    }
+                    // The intermediate array is necessary for overlapping views (where src and dest
+                    // are the same buffer)
+                    byte[] srcBytes = toJavaBytesNode.execute(srcView);
+                    int itemsize = srcView.getItemSize();
+                    for (int i = 0; i < destView.getBufferShape()[0]; i++) {
+                        MemoryViewNodes.MemoryPointer destPtr = pointerLookupNode.execute(frame, destView, i);
+                        writeBytesAtNode.execute(srcBytes, i * itemsize, itemsize, self, destPtr.ptr, destPtr.offset);
+                    }
+                    return PNone.NONE;
+                } finally {
+                    releaseNode.execute(frame, destView);
+                }
+            } finally {
+                releaseNode.execute(frame, srcView);
             }
-            return PNone.NONE;
         }
 
         @Specialization
@@ -350,6 +359,7 @@ boolean eq(VirtualFrame frame, PMemoryView self, PMemoryView other,
         @Specialization(guards = "!isMemoryView(other)")
         Object eq(VirtualFrame frame, PMemoryView self, Object other,
                         @Cached BuiltinConstructors.MemoryViewNode memoryViewNode,
+                        @Cached ReleaseNode releaseNode,
                         @CachedLibrary(limit = "3") PythonObjectLibrary lib,
                         @Cached MemoryViewNodes.ReadItemAtNode readSelf,
                         @Cached MemoryViewNodes.ReadItemAtNode readOther) {
@@ -359,7 +369,11 @@ Object eq(VirtualFrame frame, PMemoryView self, Object other,
             } catch (PException e) {
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
-            return eq(frame, self, memoryView, lib, readSelf, readOther);
+            try {
+                return eq(frame, self, memoryView, lib, readSelf, readOther);
+            } finally {
+                releaseNode.execute(frame, memoryView);
+            }
         }
 
         @Fallback

graalpython/lib-graalpython/_io.py

@@ -563,7 +563,7 @@ def open_code(path):
 
 # ----------------------------------------------------------------------------------------------------------------------
 #
-# following definitions: patched in the __builtins_patches__ module
+# following definitions: patched in the pyio_patches module
 #
 # ----------------------------------------------------------------------------------------------------------------------
 class _BufferedIOBase(_IOBase):
@@ -612,7 +612,7 @@ def open(*args, **kwargs):
 
 # ----------------------------------------------------------------------------------------------------------------------
 #
-# needed for imports will be patched in the __builtins_patches__ module
+# needed for imports will be patched in the pyio_patches module
 #
 # ----------------------------------------------------------------------------------------------------------------------
 import builtins