type constructor: special handling of __qualname__

PythonClass: fix interoplib getMetaSimpleName and getMetaQualifiedName messages

Author: cosminbasca

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

@@ -2342,6 +2342,7 @@ private PythonClass typeMetaclass(VirtualFrame frame, String name, PTuple bases,
             // copy the dictionary slots over, as CPython does through PyDict_Copy
             // Also check for a __slots__ sequence variable in dict
             Object slots = null;
+            boolean qualnameSet = false;
             for (DictEntry entry : nslib.entries(namespace.getDictStorage())) {
                 Object key = entry.getKey();
                 Object value = entry.getValue();
@@ -2380,11 +2381,22 @@ private PythonClass typeMetaclass(VirtualFrame frame, String name, PTuple bases,
                         }
                     }
                     pythonClass.setAttribute(key, value);
+                } else if (SpecialAttributeNames.__QUALNAME__.equals(key)) {
+                    try {
+                        pythonClass.setQualName(ensureCastToStringNode().execute(value));
+                        qualnameSet = true;
+                    } catch (CannotCastException e) {
+                        throw raise(PythonBuiltinClassType.TypeError, ErrorMessages.MUST_BE_S_NOT_P, "type __qualname__", "str", value);
+                    }
                 } else {
                     pythonClass.setAttribute(key, value);
                 }
             }
 
+            if (!qualnameSet) {
+                pythonClass.setQualName(name);
+            }
+
             // CPython masks the __hash__ method with None when __eq__ is overriden, but __hash__ is
             // not
             Object hashMethod = nslib.getItem(namespace.getDictStorage(), __HASH__);

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

@@ -26,13 +26,9 @@
 package com.oracle.graal.python.builtins.objects.type;
 
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
-import com.oracle.graal.python.nodes.SpecialAttributeNames;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
-import com.oracle.graal.python.nodes.util.CannotCastException;
-import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
@@ -67,32 +63,13 @@ boolean isMetaInstance(Object instance,
     }
 
     @ExportMessage
-    String getMetaSimpleName(
-                    @Exclusive @Cached ReadAttributeFromDynamicObjectNode getName,
-                    @Shared("castStr") @Cached CastToJavaStringNode castStr) {
-        // n.b.: we're reading directly from the storage here, because this
-        // method must not have side-effects, so even if there's a __dict__, we
-        // cannot call its __getitem__
-        try {
-            return castStr.execute(getName.execute(getStorage(), SpecialAttributeNames.__NAME__));
-        } catch (CannotCastException e) {
-            return "unnamed-class";
-
-        }
+    String getMetaSimpleName() {
+        return getName();
     }
 
     @ExportMessage
-    String getMetaQualifiedName(
-                    @Exclusive @Cached ReadAttributeFromDynamicObjectNode getName,
-                    @Shared("castStr") @Cached CastToJavaStringNode castStr) {
-        // n.b.: we're reading directly from the storage here, because this
-        // method must not have side-effects, so even if there's a __dict__, we
-        // cannot call its __getitem__
-        try {
-            return castStr.execute(getName.execute(getStorage(), SpecialAttributeNames.__QUALNAME__));
-        } catch (CannotCastException e) {
-            return "unnamed-class";
-        }
+    String getMetaQualifiedName() {
+        return getQualName();
     }
 
     /*

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

@@ -818,12 +818,7 @@ String getNameType(PythonBuiltinClassType cls, @SuppressWarnings("unused") PNone
         }
 
         @Specialization(guards = "isNoValue(value)")
-        String getNameBuiltin(PythonBuiltinClass cls, @SuppressWarnings("unused") PNone value) {
-            return cls.getName();
-        }
-
-        @Specialization(guards = {"isNoValue(value)", "!isPythonBuiltinClass(cls)"})
-        Object getName(PythonClass cls, @SuppressWarnings("unused") PNone value) {
+        String getNameBuiltin(PythonManagedClass cls, @SuppressWarnings("unused") PNone value) {
             return cls.getName();
         }
 
@@ -938,16 +933,10 @@ String getName(PythonBuiltinClassType cls, @SuppressWarnings("unused") PNone val
         }
 
         @Specialization(guards = "isNoValue(value)")
-        String getName(PythonBuiltinClass cls, @SuppressWarnings("unused") PNone value) {
+        String getName(PythonManagedClass cls, @SuppressWarnings("unused") PNone value) {
             return cls.getQualName();
         }
 
-        @Specialization(guards = {"isNoValue(value)", "!isPythonBuiltinClass(cls)"})
-        Object getName(PythonClass cls, @SuppressWarnings("unused") PNone value,
-                        @Cached("create()") ReadAttributeFromObjectNode getName) {
-            return getName.execute(cls, __QUALNAME__);
-        }
-
         @Specialization(guards = "!isNoValue(value)")
         Object setName(@SuppressWarnings("unused") PythonBuiltinClass cls, @SuppressWarnings("unused") Object value) {
             throw raise(PythonErrorType.RuntimeError, ErrorMessages.CANT_SET_ATTRIBUTES_OF_TYPE, "built-in/extension 'type'");