[GR-35534] Backport to fix type constructor lookup

PullRequest: graalpython/2075

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_class.py

@@ -52,3 +52,72 @@ def test_new_not_descriptor():
     class C:
         __new__ = str
     assert C() == str(C)
+
+
+def test_meta_meta_new():
+    class NewDescriptor():
+        def new_descriptor_new(self):
+            def m(*a, **kw):
+                cls = type.__new__(*a, **kw)
+                cls.metatype = NewDescriptor
+                return cls
+            return m
+
+        def __get__(self, *args):
+            return self.new_descriptor_new()
+
+        def __set__(self, *args):
+            raise NotImplementedError
+
+    class MetaMeta(type):
+        def __new__(*args, **kwargs):
+            cls = type.__new__(*args, **kwargs)
+            cls.metatype = MetaMeta
+            return cls
+
+    class Meta(type, metaclass=MetaMeta):
+        def __new__(*args, **kwargs):
+            cls = type.__new__(*args, **kwargs)
+            cls.metatype = Meta
+            return cls
+
+    assert Meta.metatype is MetaMeta
+
+    class aMeta(metaclass=Meta):
+        pass
+
+    aMeta2 = type("aMeta2", (aMeta,), {})
+    assert aMeta.metatype is Meta
+    assert aMeta2.metatype is Meta
+
+    # overriding the meta-meta-class' __new__ does not affect creating new
+    # instances of the meta-class
+    MetaMeta.__new__ = Meta.__new__
+
+    class stillAMeta(metaclass=Meta):
+        pass
+    stillAMeta2 = type("stillAMeta2", (stillAMeta,), {})
+
+    # overriding the meta-meta-class' __new__ does affect creating new
+    # meta-classes
+    class aMetaThatIsNotAMetaMeta(metaclass=MetaMeta):
+        pass
+    aMetaThatIsNotAMetaMeta2 = type("aMetaThatIsNotAMetaMeta2", (aMetaThatIsNotAMetaMeta,), {})
+
+    assert stillAMeta.metatype is Meta
+    assert stillAMeta2.metatype is Meta
+    assert aMetaThatIsNotAMetaMeta.metatype is Meta
+    assert aMetaThatIsNotAMetaMeta2.metatype is Meta
+
+    # setting the meta-meta class' __new__ to a data descriptor does affect
+    # creating instances of the instances of the meta-meta-class
+    MetaMeta.__new__ = NewDescriptor()
+
+    class notAMeta(metaclass=Meta):
+        pass
+    notAMeta2 = type("notAMeta2", (notAMeta,), {})
+
+    # the below assertions should pass, but this is such an unusual case that we
+    # ignore this.
+    # assert notAMeta.metatype is NewDescriptor
+    # assert notAMeta2.metatype is NewDescriptor

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

@@ -175,6 +175,7 @@
 import com.oracle.graal.python.builtins.objects.type.PythonManagedClass;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.builtins.objects.type.TypeFlags;
+import com.oracle.graal.python.builtins.objects.type.TypeBuiltins;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetBestBaseClassNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetItemsizeNode;
@@ -2140,7 +2141,8 @@ Object typeNew(VirtualFrame frame, Object cls, Object wName, PTuple bases, PDict
                         @Cached GetClassNode getClassNode,
                         @CachedLibrary(limit = "3") HashingStorageLibrary hashingStoragelib,
                         @Cached BranchProfile updatedStorage,
-                        @Cached("create(New)") LookupInheritedSlotNode getNewFuncNode,
+                        @Cached("create(New)") LookupCallableSlotInMRONode getNewFuncNode,
+                        @Cached TypeBuiltins.BindNew bindNew,
                         @Cached("create(__INIT_SUBCLASS__)") GetAttributeNode getInitSubclassNode,
                         @Cached("create(SetName)") LookupInheritedSlotNode getSetNameNode,
                         @Cached("create(__MRO_ENTRIES__)") LookupInheritedAttributeNode lookupMroEntriesNode,
@@ -2167,7 +2169,7 @@ Object typeNew(VirtualFrame frame, Object cls, Object wName, PTuple bases, PDict
                     // the new metaclass has the same __new__ function as we are in, continue
                 } else {
                     // Pass it to the winner
-                    return callNewFuncNode.execute(frame, newFunc, new Object[]{winner, name, bases, namespaceOrig}, kwds);
+                    return callNewFuncNode.execute(frame, bindNew.execute(frame, newFunc, winner), new Object[]{winner, name, bases, namespaceOrig}, kwds);
                 }
             }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java

@@ -365,7 +365,7 @@ Object selfSeparate(VirtualFrame frame, Object self, Object[] arguments, PKeywor
     }
 
     @ReportPolymorphism
-    protected abstract static class BindNew extends PNodeWithContext {
+    public abstract static class BindNew extends PNodeWithContext {
         public abstract Object execute(VirtualFrame frame, Object descriptor, Object type);
 
         @Specialization