diff --git a/‎crates/codegen/src/compile.rs‎
Lines changed: 1 addition & 4 deletions b/‎crates/codegen/src/compile.rs‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎crates/compiler-core/src/bytecode/instruction.rs‎
Lines changed: 7 additions & 7 deletions b/‎crates/compiler-core/src/bytecode/instruction.rs‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎crates/vm/src/frame.rs‎
Lines changed: 31 additions & 0 deletions b/‎crates/vm/src/frame.rs‎
Lines changed: 31 additions & 0 deletions
@@ -4356,10 +4356,7 @@ impl Compiler {
 
         // PEP 649: Initialize __classdict__ cell for class annotation scope
         if self.current_symbol_table().needs_classdict {
-            let locals_name = self.name("locals");
-            emit!(self, Instruction::LoadName(locals_name));
-            emit!(self, Instruction::PushNull);
-            emit!(self, Instruction::Call { nargs: 0 });
+            emit!(self, Instruction::LoadLocals);
             let classdict_idx = self.get_cell_var_index("__classdict__")?;
             emit!(self, Instruction::StoreDeref(classdict_idx));
         }
 
@@ -591,14 +591,14 @@ impl InstructionMetadata for Instruction {
             }
             // Pseudo instructions (calculated before conversion)
             Self::Cache => 0,
-            Self::BinarySlice => 0,
+            Self::BinarySlice => -2, // (container, start, stop -- res)
             Self::BinaryOpInplaceAddUnicode => 0,
-            Self::EndFor => -1, // pop next value at end of loop iteration
-            Self::ExitInitCheck => 0,
+            Self::EndFor => -1,        // pop next value at end of loop iteration
+            Self::ExitInitCheck => -1, // (should_be_none -- )
             Self::InterpreterExit => 0,
-            Self::LoadLocals => 0,
+            Self::LoadLocals => 1,      // ( -- locals)
             Self::ReturnGenerator => 1, // pushes None for POP_TOP to consume
-            Self::StoreSlice => 0,
+            Self::StoreSlice => -4,     // (v, container, start, stop -- )
             Self::CopyFreeVars { .. } => 0,
             Self::EnterExecutor => 0,
             Self::JumpBackwardNoInterrupt { .. } => 0,
@@ -610,8 +610,8 @@ impl InstructionMetadata for Instruction {
             Self::LoadFromDictOrGlobals(_) => 0,
             Self::MakeCell(_) => 0,
             Self::StoreFastStoreFast { .. } => 0,
-            Self::PopJumpIfNone { .. } => 0,
-            Self::PopJumpIfNotNone { .. } => 0,
+            Self::PopJumpIfNone { .. } => -1,    // (value -- )
+            Self::PopJumpIfNotNone { .. } => -1, // (value -- )
             Self::BinaryOpAddFloat => 0,
             Self::BinaryOpAddInt => 0,
             Self::BinaryOpAddUnicode => 0,
 
@@ -1134,6 +1134,12 @@ impl ExecutingFrame<'_> {
                 self.push_value(vm.builtins.get_attr(identifier!(vm, __build_class__), vm)?);
                 Ok(None)
             }
+            Instruction::LoadLocals => {
+                // Push the locals dict onto the stack
+                let locals = self.locals.clone().into_object();
+                self.push_value(locals);
+                Ok(None)
+            }
             Instruction::LoadFromDictOrDeref(i) => {
                 let i = i.get(arg) as usize;
                 let name = if i < self.code.cellvars.len() {
@@ -1522,6 +1528,20 @@ impl ExecutingFrame<'_> {
             }
             Instruction::PopJumpIfFalse { target } => self.pop_jump_if(vm, target.get(arg), false),
             Instruction::PopJumpIfTrue { target } => self.pop_jump_if(vm, target.get(arg), true),
+            Instruction::PopJumpIfNone { target } => {
+                let value = self.pop_value();
+                if vm.is_none(&value) {
+                    self.jump(target.get(arg));
+                }
+                Ok(None)
+            }
+            Instruction::PopJumpIfNotNone { target } => {
+                let value = self.pop_value();
+                if !vm.is_none(&value) {
+                    self.jump(target.get(arg));
+                }
+                Ok(None)
+            }
             Instruction::PopTop => {
                 // Pop value from stack and ignore.
                 self.pop_value();
@@ -1790,6 +1810,17 @@ impl ExecutingFrame<'_> {
                 self.push_value(value);
                 Ok(None)
             }
+            Instruction::ExitInitCheck => {
+                // Check that __init__ returned None
+                let should_be_none = self.pop_value();
+                if !vm.is_none(&should_be_none) {
+                    return Err(vm.new_type_error(format!(
+                        "__init__() should return None, not '{}'",
+                        should_be_none.class().name()
+                    )));
+                }
+                Ok(None)
+            }
             Instruction::CleanupThrow => {
                 // CLEANUP_THROW: (sub_iter, last_sent_val, exc) -> (None, value) OR re-raise
                 // If StopIteration: pop all 3, extract value, push (None, value)