Handle __classcell__ and __classdictcell__ in type.__new__

youknowone · youknowone · commit e6975f9735c0 · 2026-03-22T12:59:20.000+09:00
- Remove __classcell__ from class dict after setting the cell value
- Add __classdictcell__ handling: set cell to class namespace dict,
  then remove from class dict
- Register __classdictcell__ identifier
- Use LoadClosure instead of LoadDeref for __classdictcell__ emission
- Reorder MakeFunctionFlag bits to match CPython
- Run ruff format on scripts
diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs
@@ -4693,7 +4693,13 @@ impl Compiler {
         // Store __classdictcell__ if __classdict__ is a cell variable
         if self.current_symbol_table().needs_classdict {
             let classdict_idx = self.get_cell_var_index("__classdict__")?;
-            emit!(self, Instruction::LoadDeref { i: classdict_idx });
+            // Use LoadClosure to get the cell object itself (not the value inside)
+            emit!(
+                self,
+                PseudoInstruction::LoadClosure {
+                    i: classdict_idx
+                }
+            );
             let classdictcell = self.name("__classdictcell__");
             emit!(
                 self,
diff --git a/crates/compiler-core/src/bytecode/oparg.rs b/crates/compiler-core/src/bytecode/oparg.rs
@@ -385,13 +385,13 @@ bitflagset::bitflag! {
     #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
     #[repr(u8)]
     pub enum MakeFunctionFlag {
-        Closure = 0,
-        Annotations = 1,
-        KwOnlyDefaults = 2,
-        Defaults = 3,
-        TypeParams = 4,
+        Defaults = 0,
+        KwOnlyDefaults = 1,
+        Annotations = 2,
+        Closure = 3,
         /// PEP 649: __annotate__ function closure (instead of __annotations__ dict)
-        Annotate = 5,
+        Annotate = 4,
+        TypeParams = 5,
     }
 }
 
diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs
@@ -2133,15 +2133,29 @@ 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 attrs = typ.attributes.write();
+            if let Some(cell) = attrs.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()));
+                attrs.shift_remove(identifier!(vm, __classcell__));
+            }
+            if let Some(cell) = attrs.get(identifier!(vm, __classdictcell__)) {
+                let cell = PyCellRef::try_from_object(vm, cell.clone()).map_err(|_| {
+                    vm.new_type_error(format!(
+                        "__classdictcell__ must be a nonlocal cell, not {}",
+                        cell.class().name()
+                    ))
+                })?;
+                cell.set(Some(dict.clone().into()));
+                attrs.shift_remove(identifier!(vm, __classdictcell__));
+            }
+        }
 
         // All *classes* should have a dict. Exceptions are *instances* of
         // classes that define __slots__ and instances of built-in classes
diff --git a/crates/vm/src/vm/context.rs b/crates/vm/src/vm/context.rs
@@ -118,6 +118,7 @@ declare_const_name! {
     __class__,
     __class_getitem__,
     __classcell__,
+    __classdictcell__,
     __complex__,
     __contains__,
     __copy__,
