[GR-36268] Small bug fixes

PullRequest: graalpython/2098

Author: phoeinx

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -79,7 +79,6 @@
 import com.oracle.graal.python.lib.PyTupleCheckExactNodeGen;
 import com.oracle.graal.python.lib.PyUnicodeCheckExactNodeGen;
 import com.oracle.graal.python.nodes.ErrorMessages;
-import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -180,18 +179,17 @@ protected static LookupAndCallBinaryNode createCallReadNode() {
         @Specialization
         Object doit(VirtualFrame frame, Object file,
                         @Cached("createCallReadNode()") LookupAndCallBinaryNode callNode,
-                        @CachedLibrary(limit = "3") PythonBufferAcquireLibrary bufferLib,
-                        @Cached PRaiseNode raise) {
+                        @CachedLibrary(limit = "3") PythonBufferAcquireLibrary bufferLib) {
             Object buffer = callNode.executeObject(frame, file, 0);
             if (!bufferLib.hasBuffer(buffer)) {
                 throw raise(PythonBuiltinClassType.TypeError, "file.read() returned not bytes but %p", buffer);
             }
             try {
                 return Marshal.loadFile(file);
             } catch (NumberFormatException e) {
-                throw raise.raise(PythonBuiltinClassType.ValueError, ErrorMessages.BAD_MARSHAL_DATA_S, e.getMessage());
+                throw raise(PythonBuiltinClassType.ValueError, ErrorMessages.BAD_MARSHAL_DATA_S, e.getMessage());
             } catch (Marshal.MarshalError me) {
-                throw raise.raise(me.type, me.message, me.arguments);
+                throw raise(me.type, me.message, me.arguments);
             }
         }
     }
@@ -200,17 +198,18 @@ Object doit(VirtualFrame frame, Object file,
     @ArgumentClinic(name = "bytes", conversion = ClinicConversion.ReadableBuffer)
     @GenerateNodeFactory
     abstract static class LoadsNode extends PythonUnaryClinicBuiltinNode {
-        @TruffleBoundary
-        @Specialization(limit = "3")
-        static Object doit(Object buffer,
-                        @CachedLibrary("buffer") PythonBufferAccessLibrary bufferLib,
-                        @Cached PRaiseNode raise) {
+
+        @Specialization
+        Object doit(VirtualFrame frame, Object buffer,
+                        @CachedLibrary(limit = "3") PythonBufferAccessLibrary bufferLib) {
             try {
                 return Marshal.load(bufferLib.getInternalOrCopiedByteArray(buffer), bufferLib.getBufferLength(buffer));
             } catch (NumberFormatException e) {
-                throw raise.raise(PythonBuiltinClassType.ValueError, ErrorMessages.BAD_MARSHAL_DATA_S, e.getMessage());
+                throw raise(PythonBuiltinClassType.ValueError, ErrorMessages.BAD_MARSHAL_DATA_S, e.getMessage());
             } catch (Marshal.MarshalError me) {
-                throw raise.raise(me.type, me.message, me.arguments);
+                throw raise(me.type, me.message, me.arguments);
+            } finally {
+                bufferLib.release(buffer, frame, this);
             }
         }
 

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

@@ -1849,7 +1849,7 @@ Object doIt(Object self, String className) {
         }
     }
 
-    @Builtin(name = "PyTruffle_NewTypeDict")
+    @Builtin(name = "PyTruffle_NewTypeDict", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     @TypeSystemReference(PythonTypes.class)
     public abstract static class PyTruffleNewTypeDict extends PythonUnaryBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CDataObject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -136,6 +136,7 @@ void writeByte(int byteIndex, byte value,
                     @CachedLibrary(limit = "2") PythonBufferAccessLibrary bufferLib) {
         if (b_ptr.ptr != null) {
             bufferLib.writeByte(b_ptr.ptr, b_ptr.offset + byteIndex, value);
+            return;
         }
         throw CompilerDirectives.shouldNotReachHere("buffer write to empty CDataObject");
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/buffer/PythonBufferAccessLibrary.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -100,7 +100,11 @@ public static void assertIsBuffer(Object receiver) {
 
     /**
      * Release the buffer. Equivalent of CPython's {@code PyBuffer_Release}, but must not be called
-     * multiple times on the same buffer.
+     * multiple times on the same buffer. If the caller has access to a VirtualFrame
+     * {@link #release(Object, VirtualFrame, PNodeWithRaiseAndIndirectCall)} or
+     * {@link #release(Object, VirtualFrame, PythonContext, PythonLanguage, IndirectCallNode)}
+     * should be used. If the caller doesn't have access to a VirtualFrame it must be ensured that
+     * an IndirectCallContext was already created in the call path.
      */
     public void release(@SuppressWarnings("unused") Object receiver) {
     }