revert #[repr(...)] changes

ShaharNaveh · ShaharNaveh · commit 3d5295dc57e2 · 2026-04-09T19:04:46.000+02:00
diff --git a/crates/compiler-core/src/bytecode.rs b/crates/compiler-core/src/bytecode.rs
@@ -21,7 +21,8 @@ use rustpython_wtf8::{Wtf8, Wtf8Buf};
 
 pub use crate::bytecode::{
     instruction::{
-        AnyInstruction, Arg, Instruction, InstructionMetadata, PseudoInstruction, StackEffect,
+        AnyInstruction, 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
@@ -80,9 +80,10 @@ macro_rules! define_opcodes {
         }
 
         #[derive(Clone, Copy, Debug)]
+        #[repr($typ)]
         pub enum $instr_name {
             $(
-                $op_name $({ $arg_name: Arg<$arg_type> })?
+                $op_name $({ $arg_name: Arg<$arg_type> })? = $op_id
             ),*
         }
 
@@ -1626,3 +1627,8 @@ impl<T: OpArgType> fmt::Debug for Arg<T> {
         write!(f, "Arg<{}>", core::any::type_name::<T>())
     }
 }
+
+// TODO: Can probably remove these asserts and remove the `repr($typ)` from the macro. but this
+// breaks the VM:/
+const _: () = assert!(core::mem::size_of::<Instruction>() == 1);
+const _: () = assert!(core::mem::size_of::<PseudoInstruction>() == 2);

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,10 @@ macro_rules! define_opcodes {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`#[derive(Clone, Copy, Debug)]`
	`83`	`+ #[repr($typ)]`
`83`	`84`	`pub enum $instr_name {`
`84`	`85`	`$(`
`85`		`- $op_name $({ $arg_name: Arg<$arg_type> })?`
	`86`	`+ $op_name $({ $arg_name: Arg<$arg_type> })? = $op_id`
`86`	`87`	`),*`
`87`	`88`	`}`
`88`	`89`
`@@ -1626,3 +1627,8 @@ impl<T: OpArgType> fmt::Debug for Arg<T> {`
`1626`	`1627`	`write!(f, "Arg<{}>", core::any::type_name::<T>())`
`1627`	`1628`	`}`
`1628`	`1629`	`}`
	`1630`	`+`
	`1631`	+// TODO: Can probably remove these asserts and remove the `repr($typ)` from the macro. but this
	`1632`	`+// breaks the VM:/`
	`1633`	`+const _: () = assert!(core::mem::size_of::<Instruction>() == 1);`
	`1634`	`+const _: () = assert!(core::mem::size_of::<PseudoInstruction>() == 2);`