LoadClassDeref -> LoadFromDictOrDeref

ShaharNaveh · ShaharNaveh · commit 07e7f4684f11 · 2026-01-10T14:40:43.000+02:00
diff --git a/Lib/_opcode_metadata.py b/Lib/_opcode_metadata.py
@@ -136,7 +136,6 @@
     'JUMP_IF_FALSE_OR_POP': 129,
     'JUMP_IF_TRUE_OR_POP': 130,
     'JUMP_IF_NOT_EXC_MATCH': 131,
-    'LOAD_CLASS_DEREF': 132,
     'SET_EXC_INFO': 134,
     'SUBSCRIPT': 135,
     'RESUME': 149,
diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs
@@ -1561,7 +1561,7 @@ impl Compiler {
                     NameUsage::Load => {
                         // Special case for class scope
                         if self.ctx.in_class && !self.ctx.in_func() {
-                            Instruction::LoadClassDeref
+                            Instruction::LoadFromDictOrDeref
                         } else {
                             Instruction::LoadDeref
                         }
diff --git a/crates/compiler-core/src/bytecode.rs b/crates/compiler-core/src/bytecode.rs
@@ -842,7 +842,7 @@ pub enum Instruction {
     LoadFastLoadFast {
         arg: Arg<u32>,
     } = 88, // Placeholder
-    LoadFromDictOrDeref(Arg<NameIdx>) = 89, // Placeholder
+    LoadFromDictOrDeref(Arg<NameIdx>) = 89,
     LoadFromDictOrGlobals(Arg<NameIdx>) = 90, // Placeholder
     LoadGlobal(Arg<NameIdx>) = 91,
     LoadName(Arg<NameIdx>) = 92,
@@ -945,7 +945,6 @@ pub enum Instruction {
         target: Arg<Label>,
     } = 130,
     JumpIfNotExcMatch(Arg<Label>) = 131,
-    LoadClassDeref(Arg<NameIdx>) = 132,
     SetExcInfo = 134,
     Subscript = 135,
     // ===== Pseudo Opcodes (252+) ======
@@ -1010,7 +1009,6 @@ impl TryFrom<u8> for Instruction {
                 target: Arg::marker(),
             }),
             u8::from(Self::JumpIfNotExcMatch(Arg::marker())),
-            u8::from(Self::LoadClassDeref(Arg::marker())),
             u8::from(Self::SetExcInfo),
             u8::from(Self::Subscript),
         ];
@@ -1805,14 +1803,14 @@ impl Instruction {
             Nop => 0,
             ImportName { .. } => -1,
             ImportFrom { .. } => 1,
-            LoadFast(_) | LoadFastAndClear(_) | LoadName(_) | LoadGlobal(_) | LoadDeref(_)
-            | LoadClassDeref(_) => 1,
+            LoadFast(_) | LoadFastAndClear(_) | LoadName(_) | LoadGlobal(_) | LoadDeref(_) => 1,
             StoreFast(_) | StoreName(_) | StoreGlobal(_) | StoreDeref(_) => -1,
             StoreFastLoadFast { .. } => 0, // pop 1, push 1
             DeleteFast(_) | DeleteName(_) | DeleteGlobal(_) | DeleteDeref(_) => 0,
             LoadClosure(_) => 1,
             Subscript => -1,
             StoreSubscr => -3,
+            LoadFromDictOrDeref(_) => 1,
             DeleteSubscr => -2,
             LoadAttr { .. } => 0,
             // LoadAttrMethod: pop obj, push method + self_or_null
@@ -1950,7 +1948,33 @@ impl Instruction {
             UnaryNot => 0,
             GetYieldFromIter => 0,
             PushNull => 1, // Push NULL for call protocol
-            _ => 0,
+            Cache => 0,
+            BinarySlice => 0,
+            BinaryOpInplaceAddUnicode => 0,
+            EndFor => 0,
+            ExitInitCheck => 0,
+            InterpreterExit => 0,
+            LoadAssertionError => 0,
+            LoadLocals => 0,
+            ReturnGenerator => 0,
+            StoreSlice => 0,
+            DictMerge { .. } => 0,
+            BuildConstKeyMap { .. } => 0,
+            CopyFreeVars { .. } => 0,
+            EnterExecutor => 0,
+            JumpBackwardNoInterrupt { .. } => 0,
+            JumpBackward { .. } => 0,
+            JumpForward { .. } => 0,
+            ListExtend { .. } => 0,
+            LoadFastCheck(_) => 0,
+            LoadFastLoadFast { .. } => 0,
+            LoadFromDictOrGlobals(_) => 0,
+            SetUpdate { .. } => 0,
+            MakeCell(_) => 0,
+            LoadSuperAttr { .. } => 0,
+            StoreFastStoreFast { .. } => 0,
+            PopJumpIfNone { .. } => 0,
+            PopJumpIfNotNone { .. } => 0,
         }
     }
 
@@ -2096,7 +2120,7 @@ impl Instruction {
             }
             LoadAttrMethod { idx } => w!(LOAD_ATTR_METHOD, name = idx),
             LoadBuildClass => w!(LOAD_BUILD_CLASS),
-            LoadClassDeref(idx) => w!(LOAD_CLASSDEREF, cell_name = idx),
+            LoadFromDictOrDeref(i) => w!(LOAD_FROM_DICT_OR_DEREF, cell_name = i),
             LoadClosure(i) => w!(LOAD_CLOSURE, cell_name = i),
             LoadConst { idx } => fmt_const("LOAD_CONST", arg, f, idx),
             LoadDeref(idx) => w!(LOAD_DEREF, cell_name = idx),
diff --git a/crates/stdlib/src/opcode.rs b/crates/stdlib/src/opcode.rs
@@ -108,7 +108,7 @@ mod opcode {
                 && matches!(
                     Instruction::try_from(opcode as u8),
                     Ok(Instruction::DeleteDeref(_)
-                        | Instruction::LoadClassDeref(_)
+                        | Instruction::LoadFromDictOrDeref(_)
                         | Instruction::LoadClosure(_)
                         | Instruction::LoadDeref(_)
                         | Instruction::StoreDeref(_))
diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs
@@ -1112,7 +1112,7 @@ impl ExecutingFrame<'_> {
                 self.push_value(vm.builtins.get_attr(identifier!(vm, __build_class__), vm)?);
                 Ok(None)
             }
-            bytecode::Instruction::LoadClassDeref(i) => {
+            bytecode::Instruction::LoadFromDictOrDeref(i) => {
                 let i = i.get(arg) as usize;
                 let name = if i < self.code.cellvars.len() {
                     self.code.cellvars[i]

Original file line number	Diff line number	Diff line change
`@@ -1561,7 +1561,7 @@ impl Compiler {`
`1561`	`1561`	`NameUsage::Load => {`
`1562`	`1562`	`// Special case for class scope`
`1563`	`1563`	`if self.ctx.in_class && !self.ctx.in_func() {`
`1564`		`- Instruction::LoadClassDeref`
	`1564`	`+ Instruction::LoadFromDictOrDeref`
`1565`	`1565`	`} else {`
`1566`	`1566`	`Instruction::LoadDeref`
`1567`	`1567`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1112,7 +1112,7 @@ impl ExecutingFrame<'_> {`
`1112`	`1112`	`self.push_value(vm.builtins.get_attr(identifier!(vm, __build_class__), vm)?);`
`1113`	`1113`	`Ok(None)`
`1114`	`1114`	`}`
`1115`		`- bytecode::Instruction::LoadClassDeref(i) => {`
	`1115`	`+ bytecode::Instruction::LoadFromDictOrDeref(i) => {`
`1116`	`1116`	`let i = i.get(arg) as usize;`
`1117`	`1117`	`let name = if i < self.code.cellvars.len() {`
`1118`	`1118`	`self.code.cellvars[i]`