Add TypeVar bytecodes

RustPython · youknowone · May 10, 2024 · May 6, 2024 · May 7, 2024 · May 7, 2024
commit bfa18d25779bea858a8f40554085a2e1c28dee81
diff --git a/compiler/core/src/bytecode.rs b/compiler/core/src/bytecode.rs
@@ -588,7 +588,13 @@ pub enum Instruction {
     GetANext,
     EndAsyncFor,
     ExtendedArg,
+    TypeVar,
+    TypeVarWithBound,
+    TypeVarWithConstraint,
+    TypeAlias,
 }
+// This must be kept up to date to avoid marshaling errors
+const LAST_INSTRUCTION: Instruction = Instruction::TypeAlias;
 const _: () = assert!(mem::size_of::<Instruction>() == 1);
 
 impl From<Instruction> for u8 {
@@ -604,7 +610,7 @@ impl TryFrom<u8> for Instruction {
 
     #[inline]
     fn try_from(value: u8) -> Result<Self, crate::marshal::MarshalError> {
-        if value <= u8::from(Instruction::ExtendedArg) {
+        if value <= u8::from(LAST_INSTRUCTION) {
             Ok(unsafe { std::mem::transmute::<u8, Instruction>(value) })
         } else {
             Err(crate::marshal::MarshalError::InvalidBytecode)
@@ -636,6 +642,7 @@ bitflags! {
         const ANNOTATIONS = 0x02;
         const KW_ONLY_DEFAULTS = 0x04;
         const DEFAULTS = 0x08;
+        const TYPE_PARAMS = 0x10;
     }
 }
 impl OpArgType for MakeFunctionFlags {
@@ -1270,6 +1277,10 @@ impl Instruction {
             GetANext => 1,
             EndAsyncFor => -2,
             ExtendedArg => 0,
+            TypeVar => 0,
+            TypeVarWithBound => -1,
+            TypeVarWithConstraint => -1,
+            TypeAlias => -2,
         }
     }
 
@@ -1431,6 +1442,10 @@ impl Instruction {
             GetANext => w!(GetANext),
             EndAsyncFor => w!(EndAsyncFor),
             ExtendedArg => w!(ExtendedArg, Arg::<u32>::marker()),
+            TypeVar => w!(TypeVar),
+            TypeVarWithBound => w!(TypeVarWithBound),
+            TypeVarWithConstraint => w!(TypeVarWithConstraint),
+            TypeAlias => w!(TypeAlias),
         }
     }
 }