Add AnyOpcode enum

youknowone · Apr 15, 2026 · Apr 9, 2026 · Apr 9, 2026 · Apr 9, 2026 · Apr 10, 2026
commit f6fb58da5484c4c3661e265fc88083edc11e6208
diff --git a/crates/compiler-core/src/bytecode.rs b/crates/compiler-core/src/bytecode.rs
@@ -21,8 +21,8 @@ use rustpython_wtf8::{Wtf8, Wtf8Buf};
 
 pub use crate::bytecode::{
     instruction::{
-        AnyInstruction, Arg, Instruction, InstructionMetadata, Opcode, PseudoInstruction,
-        PseudoOpcode, StackEffect,
+        AnyInstruction, AnyOpcode, Arg, Instruction, InstructionMetadata, Opcode,
+        PseudoInstruction, PseudoOpcode, StackEffect,
     },
     oparg::{
         BinaryOperator, BuildSliceArgCount, CommonConstant, ComparisonOperator, ConvertValueOparg,

diff --git a/crates/compiler-core/src/bytecode/instruction.rs b/crates/compiler-core/src/bytecode/instruction.rs
@@ -1660,7 +1660,7 @@ impl AnyInstruction {
     /// If was called on something else other than [`Self::Real`].
     pub const fn expect_real(self) -> Instruction {
         self.real()
-            .expect("Expected Instruction::Real, found Instruction::Pseudo")
+            .expect("Expected AnyInstruction::Real, found AnyInstruction::Pseudo")
     }
 
     /// Same as [`Self::pseudo`] but panics if wasn't called on [`Self::Pseudo`].
@@ -1670,7 +1670,7 @@ impl AnyInstruction {
     /// If was called on something else other than [`Self::Pseudo`].
     pub const fn expect_pseudo(self) -> PseudoInstruction {
         self.pseudo()
-            .expect("Expected Instruction::Pseudo, found Instruction::Real")
+            .expect("Expected AnyInstruction::Pseudo, found AnyInstruction::Real")
     }
 
     /// Returns true if this is a block push pseudo instruction
@@ -1685,6 +1685,50 @@ impl AnyInstruction {
     }
 }
 
+#[derive(Clone, Copy, Debug)]
+pub enum AnyOpcode {
+    Real(Opcode),
+    Pseudo(PseudoOpcode),
+}
+
+impl AnyOpcode {
+    /// Gets the inner value of [`Self::Real`].
+    pub const fn real(self) -> Option<Opcode> {
+        match self {
+            Self::Real(op) => Some(op),
+            _ => None,
+        }
+    }
+
+    /// Gets the inner value of [`Self::Pseudo`].
+    pub const fn pseudo(self) -> Option<PseudoOpcode> {
+        match self {
+            Self::Pseudo(op) => Some(op),
+            _ => None,
+        }
+    }
+
+    /// Same as [`Self::real`] but panics if wasn't called on [`Self::Real`].
+    ///
+    /// # Panics
+    ///
+    /// If was called on something else other than [`Self::Real`].
+    pub const fn expect_real(self) -> Opcode {
+        self.real()
+            .expect("Expected AnyOpcode::Real, found AnyOpcode::Pseudo")
+    }
+
+    /// Same as [`Self::pseudo`] but panics if wasn't called on [`Self::Pseudo`].
+    ///
+    /// # Panics
+    ///
+    /// If was called on something else other than [`Self::Pseudo`].
+    pub const fn expect_pseudo(self) -> PseudoOpcode {
+        self.pseudo()
+            .expect("Expected AnyOpcode::Pseudo, found AnyOpcode::Real")
+    }
+}
+
 /// What effect the instruction has on the stack.
 #[derive(Clone, Copy)]
 pub struct StackEffect {