Revert __classdict__ cell and __classdictcell__ changes

youknowone · youknowone · commit 93e955cc6175 · 2026-03-22T03:46:03.000+09:00
The __classdict__ cell addition (for classes with function defs)
and __classdictcell__ store caused cell initialization failures
in importlib. These require deeper VM changes to properly support
the cell variable lifecycle. Reverted for stability.
diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs
@@ -4648,25 +4648,6 @@ 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__")?;
-            // 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,
-                Instruction::StoreName {
-                    namei: classdictcell
-                }
-            );
-        }
-
         if let Some(classcell_idx) = classcell_idx {
             emit!(
                 self,
diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs
@@ -292,20 +292,6 @@ fn drop_class_free(symbol_table: &mut SymbolTable, newfree: &mut IndexSet<String
         symbol_table.needs_classdict = true;
     }
 
-    // If the class has any function definitions, it needs __classdict__
-    // for PEP 649 deferred annotation evaluation support
-    if !symbol_table.needs_classdict {
-        let has_functions = symbol_table.sub_tables.iter().any(|t| {
-            matches!(
-                t.typ,
-                CompilerScope::Function | CompilerScope::AsyncFunction
-            )
-        });
-        if has_functions {
-            symbol_table.needs_classdict = true;
-        }
-    }
-
     // Check if __conditional_annotations__ is in the free variables collected from children
     // Remove it from free set - it's handled specially in class scope
     if newfree.shift_remove("__conditional_annotations__") {
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 {
-        Defaults = 0,
-        KwOnlyDefaults = 1,
-        Annotations = 2,
-        Closure = 3,
+        Closure = 0,
+        Annotations = 1,
+        KwOnlyDefaults = 2,
+        Defaults = 3,
+        TypeParams = 4,
         /// PEP 649: __annotate__ function closure (instead of __annotations__ dict)
-        Annotate = 4,
-        TypeParams = 5,
+        Annotate = 5,
     }
 }
 
