in typeNew:

- copy namespace, we are deleting elements from it
- do not throw 'conflicts with class variable' for qualname and classcell, they will be removed anyway
- remove also qualname, not only classcell from namespace

Author: tomasstupka

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

@@ -127,6 +127,7 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.NoGeneralizationNode;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
+import com.oracle.graal.python.builtins.objects.dict.DictBuiltins;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.enumerate.PEnumerate;
 import com.oracle.graal.python.builtins.objects.floats.FloatBuiltins;
@@ -177,6 +178,7 @@
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__QUALNAME__;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode.GetAnyAttributeNode;
@@ -2074,7 +2076,7 @@ Object type(Object cls, Object obj, PNone bases, PNone dict, PKeyword[] kwds,
         }
 
         @Specialization(guards = "isString(wName)")
-        Object typeNew(VirtualFrame frame, Object cls, Object wName, PTuple bases, PDict namespace, PKeyword[] kwds,
+        Object typeNew(VirtualFrame frame, Object cls, Object wName, PTuple bases, PDict namespaceOrig, PKeyword[] kwds,
                         @CachedLibrary(limit = "4") PythonObjectLibrary lib,
                         @CachedLibrary(limit = "2") HashingStorageLibrary nslib,
                         @Cached BranchProfile updatedStorage,
@@ -2085,8 +2087,9 @@ Object typeNew(VirtualFrame frame, Object cls, Object wName, PTuple bases, PDict
                         @Cached CallNode callSetNameNode,
                         @Cached CallNode callInitSubclassNode,
                         @Cached CallNode callNewFuncNode,
+                        @Cached("create(__DICT__)") LookupAttributeInMRONode getDictAttrNode,
                         @Cached GetBestBaseClassNode getBestBaseNode,
-                        @Cached("create(__DICT__)") LookupAttributeInMRONode getDictAttrNode) {
+                        @Cached DictBuiltins.CopyNode copyDict) {
             // Determine the proper metatype to deal with this
             String name = castStr.execute(wName);
             Object metaclass = calculate_metaclass(frame, cls, bases, lib);
@@ -2096,11 +2099,12 @@ 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
-                    callNewFuncNode.execute(frame, newFunc, new Object[]{metaclass, name, bases, namespace}, kwds);
+                    callNewFuncNode.execute(frame, newFunc, new Object[]{metaclass, name, bases, namespaceOrig}, kwds);
                 }
             }
 
             try {
+                PDict namespace = (PDict) copyDict.call(frame, namespaceOrig);
                 PythonClass newType = typeMetaclass(frame, name, bases, namespace, metaclass, nslib, getDictAttrNode, getBestBaseNode);
 
                 for (DictEntry entry : nslib.entries(namespace.getDictStorage())) {
@@ -2132,6 +2136,15 @@ Object typeNew(VirtualFrame frame, Object cls, Object wName, PTuple bases, PDict
                     }
                 }
 
+                // delete __qualname__ from namespace
+                if (nslib.hasKey(namespace.getDictStorage(), __QUALNAME__)) {
+                    HashingStorage newStore = nslib.delItem(namespace.getDictStorage(), __QUALNAME__);
+                    if (newStore != namespace.getDictStorage()) {
+                        updatedStorage.enter();
+                        namespace.setDictStorage(newStore);
+                    }
+                }
+
                 // set __class__ cell contents
                 Object classcell = nslib.getItem(namespace.getDictStorage(), __CLASSCELL__);
                 if (classcell != null) {
@@ -2434,7 +2447,8 @@ private PTuple copySlots(String className, SequenceStorage slotList, int slotlen
                 setSlotItemNode().execute(newSlots, slotName, NoGeneralizationNode.DEFAULT);
                 // Passing 'null' frame is fine because the caller already transfers the exception
                 // state to the context.
-                if (nslib.hasKey(namespace.getDictStorage(), slotName)) {
+                if (!slotName.equals(__CLASSCELL__) && !slotName.equals(__QUALNAME__) && nslib.hasKey(namespace.getDictStorage(), slotName)) {
+                    // __qualname__ and __classcell__ will be deleted later
                     throw raise(PythonBuiltinClassType.ValueError, ErrorMessages.S_S_CONFLICTS_WITH_CLASS_VARIABLE, slotName, "__slots__");
                 }
                 j++;