type.__dict__

youknowone · youknowone · commit 5d196a58e974 · 2025-07-13T00:36:18.000+09:00
diff --git a/vm/src/builtins/type.rs b/vm/src/builtins/type.rs
@@ -1018,21 +1018,6 @@ impl Constructor for PyType {
             attributes.insert(identifier!(vm, __hash__), vm.ctx.none.clone().into());
         }
 
-        // All *classes* should have a dict. Exceptions are *instances* of
-        // classes that define __slots__ and instances of built-in classes
-        // (with exceptions, e.g function)
-        let __dict__ = identifier!(vm, __dict__);
-        attributes.entry(__dict__).or_insert_with(|| {
-            vm.ctx
-                .new_static_getset(
-                    "__dict__",
-                    vm.ctx.types.type_type,
-                    subtype_get_dict,
-                    subtype_set_dict,
-                )
-                .into()
-        });
-
         // TODO: Flags is currently initialized with HAS_DICT. Should be
         // updated when __slots__ are supported (toggling the flag off if
         // a class has __slots__ defined).
@@ -1124,15 +1109,28 @@ impl Constructor for PyType {
             }
         }
 
-        if let Some(cell) = typ.attributes.write().get(identifier!(vm, __classcell__)) {
-            let cell = PyCellRef::try_from_object(vm, cell.clone()).map_err(|_| {
-                vm.new_type_error(format!(
-                    "__classcell__ must be a nonlocal cell, not {}",
-                    cell.class().name()
-                ))
-            })?;
-            cell.set(Some(typ.clone().into()));
-        };
+        {
+            let mut attributes = typ.attributes.write();
+            // All *classes* should have a dict. Exceptions are *instances* of
+            // classes that define __slots__ and instances of built-in classes
+            // (with exceptions, e.g function)
+            let __dict__ = identifier!(vm, __dict__);
+            attributes.entry(__dict__).or_insert_with(|| unsafe {
+                vm.ctx
+                    .new_getset("__dict__", &typ, subtype_get_dict, subtype_set_dict)
+                    .into()
+            });
+
+            if let Some(cell) = attributes.get(identifier!(vm, __classcell__)) {
+                let cell = PyCellRef::try_from_object(vm, cell.clone()).map_err(|_| {
+                    vm.new_type_error(format!(
+                        "__classcell__ must be a nonlocal cell, not {}",
+                        cell.class().name()
+                    ))
+                })?;
+                cell.set(Some(typ.clone().into()));
+            };
+        }
 
         // avoid deadlock
         let attributes = typ
