__dict__ and __weakref__ has to be stored in __slots__

Author: tomasstupka

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2020, 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
@@ -55,7 +55,45 @@ def test_uninitialized_slot(self):
             obj.world
         obj.world = "world"
         self.assertEqual(obj.world, "world")
+        
+    def test_dict_and_weakref_are_listed_in_slots(self):
+        class D: __slots__ = ['__dict__']
+        self.assertEqual(tuple(D.__slots__), ('__dict__',))
+        self.assertEqual(tuple(D().__slots__), ('__dict__',))
 
+        class WR: __slots__ = ['__weakref__']
+        self.assertEqual(tuple(WR.__slots__), ('__weakref__',))
+        self.assertEqual(tuple(WR().__slots__), ('__weakref__',))
 
+        class DWR: __slots__ = ['__dict__', '__weakref__']
+        self.assertEqual(tuple(DWR.__slots__), ('__dict__', '__weakref__',))
+        self.assertEqual(tuple(DWR().__slots__), ('__dict__', '__weakref__',))
+
+    def test_dict_if_slots(self):
+        class C: __slots__ = ['a']
+        self.assertEqual(tuple(C.__dict__['__slots__']), ('a',))
+        
+    def test_slots_are_not_sorted(self):
+        class C: __slots__ = ['b', 'a']
+        self.assertEqual(tuple(C.__slots__), ('b', 'a',))
+
+    def test_forbidden_slot_names(self):
+            raised = False
+            try:
+                class C: 
+                    __slots__ = ['__slots__']
+            except ValueError:
+                raised = True
+            assert raised
+            
+            raised = False
+            try:
+                class C: 
+                    v = 1
+                    __slots__ = ['v']
+            except ValueError:
+                raised = True
+            assert raised
+        
 if __name__ == "__main__":
     unittest.main()

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

@@ -2341,19 +2341,28 @@ private PythonClass typeMetaclass(VirtualFrame frame, String name, PTuple bases,
                 // have slots
 
                 // Make it into a list
-                SequenceStorage slotList;
+                SequenceStorage slotsStorage;
+                Object slotsObject;
                 if (slots instanceof String) {
-                    slotList = factory().createList(new Object[]{slots}).getSequenceStorage();
+                    slotsObject = factory().createList(new Object[]{slots});
+                    slotsStorage = ((PList) slotsObject).getSequenceStorage();
+                } else if (slots instanceof PTuple) {
+                    slotsObject = slots;
+                    slotsStorage = ((PTuple) slots).getSequenceStorage();
+                } else if (slots instanceof PList) {
+                    slotsObject = slots;
+                    slotsStorage = ((PList) slots).getSequenceStorage();
                 } else {
-                    slotList = getCastToListNode().execute(frame, slots).getSequenceStorage();
+                    slotsObject = getCastToListNode().execute(frame, slots);
+                    slotsStorage = ((PList) slotsObject).getSequenceStorage();
                 }
-                int slotlen = getListLenNode().execute(slotList);
+                int slotlen = getListLenNode().execute(slotsStorage);
                 // TODO: tfel - check if slots are allowed. They are not if the base class is var
                 // sized
 
                 for (int i = 0; i < slotlen; i++) {
                     String slotName;
-                    Object element = getSlotItemNode().execute(frame, slotList, i);
+                    Object element = getSlotItemNode().execute(frame, slotsStorage, i);
                     // Check valid slot name
                     if (element instanceof String) {
                         slotName = (String) element;
@@ -2378,13 +2387,15 @@ private PythonClass typeMetaclass(VirtualFrame frame, String name, PTuple bases,
                 PythonContext context = getContextRef().get();
                 Object state = ForeignCallContext.enter(frame, context, this);
                 try {
-                    PTuple newSlots = copySlots(name, slotList, slotlen, addDict, false, namespace, nslib);
-                    pythonClass.setAttribute(__SLOTS__, newSlots);
+                    pythonClass.setAttribute(__SLOTS__, slotsObject);
                     if (basesArray.length > 1) {
                         // TODO: tfel - check if secondary bases provide weakref or dict when we
                         // don't already have one
                     }
 
+                    // checks for some name errors too
+                    PTuple newSlots = copySlots(name, slotsStorage, slotlen, addDict, false, namespace, nslib);
+
                     // add native slot descriptors
                     if (pythonClass.needsNativeAllocation()) {
                         addNativeSlots(pythonClass, newSlots);