PyObject_Bytes can use directly BytesNode if provided object has __BYTES__

Author: tomasstupka

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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
@@ -52,6 +52,7 @@ def _reference_bytes(args):
         res = obj.__bytes__()
         if not isinstance(res, bytes):
             raise TypeError("__bytes__ returned non-bytes (type %s)" % type(res).__name__)
+        return res
     if isinstance(obj, (list, tuple, memoryview)) or (not isinstance(obj, str) and hasattr(obj, "__iter__")):
         return bytes(obj)
     raise TypeError("cannot convert '%s' object to bytes" % type(obj).__name__)
@@ -683,6 +684,16 @@ def test_doc(self):
         assert len(obj.some_member.__doc__) == len(expected_doc)
         assert obj.some_member.__doc__ == expected_doc
 
+class CBytes: 
+    def __bytes__(self):
+        return b'abc'
+    
+class CBytesWrongReturn: 
+    def __bytes__(self):
+        return 'abc'
+    
+class DummyBytes(bytes): 
+    pass     
 
 class TestObjectFunctions(CPyExtTestCase):
     def compile_module(self, name):
@@ -712,6 +723,10 @@ def compile_module(self, name):
             (memoryview(b"world"),),
             (1.234,),
             (bytearray(b"blah"),),
+            (CBytes(),),
+            (CBytesWrongReturn(),),
+            (DummyBytes(),),
+            ([1,2,3],),
         ),
         arguments=["PyObject* obj"],
         resultspec="O",

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

@@ -50,6 +50,7 @@
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.modules.BuiltinConstructors.BytesNode;
 import com.oracle.graal.python.builtins.modules.BuiltinFunctions.IsInstanceNode;
 import com.oracle.graal.python.builtins.modules.BuiltinFunctions.IsSubClassNode;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CastArgsNode;
@@ -75,12 +76,8 @@
 import com.oracle.graal.python.lib.PyObjectReprAsObjectNode;
 import com.oracle.graal.python.lib.PyObjectSetItem;
 import com.oracle.graal.python.lib.PyObjectStrAsObjectNode;
-import static com.oracle.graal.python.nodes.ErrorMessages.RETURNED_NONBYTES;
-import com.oracle.graal.python.nodes.SpecialMethodNames;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETATTR__;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode.GetAnyAttributeNode;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.expression.BinaryComparisonNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -94,7 +91,6 @@
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -486,7 +482,7 @@ Object getAttr(VirtualFrame frame, Object obj, Object attr,
                         @Cached GetAttributeNode getAttrNode,
                         @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
             try {
-                return getAttrNode.execute(frame, getCore().lookupType(PythonBuiltinClassType.PythonObject), SpecialMethodNames.__GETATTRIBUTE__);
+                return getAttrNode.execute(frame, obj, attr);
             } catch (PException e) {
                 transformExceptionToNativeNode.execute(frame, e);
                 return getContext().getNativeNull();
@@ -502,7 +498,7 @@ int setAttr(VirtualFrame frame, Object obj, Object attr, Object value,
                         @Cached SetattrNode setAttrNode,
                         @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
             try {
-                setAttrNode.execute(frame, getCore().lookupType(PythonBuiltinClassType.PythonObject), __SETATTR__, value);
+                setAttrNode.execute(frame, obj, attr, value);
                 return 0;
             } catch (PException e) {
                 transformExceptionToNativeNode.execute(frame, e);
@@ -568,49 +564,35 @@ Object bytes(VirtualFrame frame, Object bytes,
             return bytes;
         }
 
-        @Specialization(guards = {"!isBytes(obj)", "!isBytesSubtype(frame, obj, getClassNode, isSubtypeNode)", "!isPNone(bytesCallable)"})
+        @Specialization(guards = {"!isBytes(obj)", "!isBytesSubtype(frame, obj, getClassNode, isSubtypeNode)", "hasBytes(frame, obj, lookupAttrNode)"}, limit = "1")
         Object bytes(VirtualFrame frame, Object obj,
-                        @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
-                        @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
+                        @Shared("getClass") @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
+                        @Shared("isSubtype") @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
                         @Cached PyObjectLookupAttr lookupAttrNode,
-                        @Bind("getBytes(frame, obj, lookupAttrNode)") Object bytesCallable,
-                        @Cached CallUnaryMethodNode callNode,
-                        @Cached BranchProfile branchProfile,
-                        @Cached PRaiseNativeNode raiseNativeNode,
+                        @Cached BytesNode bytesNode,
                         @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
             try {
-                Object res = callNode.executeObject(frame, bytesCallable, obj);
-                if (!isBytesSubtype(frame, res, getClassNode, isSubtypeNode)) {
-                    branchProfile.enter();
-                    return raiseNativeNode.execute(frame, getContext().getNativeNull(), TypeError, RETURNED_NONBYTES, new Object[]{__BYTES__, res});
-                }
-                return res;
+                return bytesNode.execute(frame, PythonBuiltinClassType.PBytes, obj, PNone.NO_VALUE, PNone.NO_VALUE);
             } catch (PException e) {
                 transformExceptionToNativeNode.execute(e);
                 return getContext().getNativeNull();
             }
         }
 
-        @Specialization(guards = {"!isBytes(obj)", "!isBytesSubtype(frame, obj, getClassNode, isSubtypeNode)", "isPNone(getBytes(frame, obj, lookupAttrNode))"})
-        Object bytes(VirtualFrame frame, Object obj,
-                        @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
-                        @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
+        @Specialization(guards = {"!isBytes(obj)", "!isBytesSubtype(frame, obj, getClassNode, isSubtypeNode)", "!hasBytes(frame, obj, lookupAttrNode)"}, limit = "1")
+        static Object bytes(VirtualFrame frame, Object obj,
+                        @Shared("getClass") @SuppressWarnings("unused") @Cached GetClassNode getClassNode,
+                        @Shared("isSubtype") @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtypeNode,
                         @Cached PyObjectLookupAttr lookupAttrNode,
-                        @Cached PyBytesFromObjectNode fromObjectNode,
-                        @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
-            try {
-                return fromObjectNode.execute(frame, obj);
-            } catch (PException e) {
-                transformExceptionToNativeNode.execute(e);
-                return getContext().getNativeNull();
-            }
+                        @Cached PyBytesFromObjectNode fromObjectNode) {
+            return fromObjectNode.execute(frame, obj);
         }
 
-        protected Object getBytes(VirtualFrame frame, Object obj, PyObjectLookupAttr lookupAttrNode) {
-            return lookupAttrNode.execute(frame, obj, __BYTES__);
+        protected static boolean hasBytes(VirtualFrame frame, Object obj, PyObjectLookupAttr lookupAttrNode) {
+            return lookupAttrNode.execute(frame, obj, __BYTES__) != PNone.NO_VALUE;
         }
 
-        protected boolean isBytesSubtype(VirtualFrame frame, Object obj, GetClassNode getClassNode, IsSubtypeNode isSubtypeNode) {
+        protected static boolean isBytesSubtype(VirtualFrame frame, Object obj, GetClassNode getClassNode, IsSubtypeNode isSubtypeNode) {
             return isSubtypeNode.execute(frame, getClassNode.execute(obj), PythonBuiltinClassType.PBytes);
         }
     }