Compile starred annotations (#5881)

youknowone · web-flow · commit 3d951a883a7a · 2025-07-01T17:20:42.000+09:00
* Fix starred annotation

* uncomment starred annotation
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -80,6 +80,7 @@ struct Compiler<'src> {
     ctx: CompileContext,
     class_name: Option<String>,
     opts: CompileOpts,
+    in_annotation: bool,
 }
 
 enum DoneWithFuture {
@@ -335,6 +336,7 @@ impl<'src> Compiler<'src> {
             },
             class_name: None,
             opts,
+            in_annotation: false,
         }
     }
 }
@@ -2897,7 +2899,11 @@ impl Compiler<'_> {
                     .into(),
             });
         } else {
-            self.compile_expression(annotation)?;
+            let was_in_annotation = self.in_annotation;
+            self.in_annotation = true;
+            let result = self.compile_expression(annotation);
+            self.in_annotation = was_in_annotation;
+            result?;
         }
         Ok(())
     }
@@ -3504,8 +3510,15 @@ impl Compiler<'_> {
                     Self::contains_await(elt),
                 )?;
             }
-            Expr::Starred(_) => {
-                return Err(self.error(CodegenErrorType::InvalidStarExpr));
+            Expr::Starred(ExprStarred { value, .. }) => {
+                if self.in_annotation {
+                    // In annotation context, starred expressions are allowed (PEP 646)
+                    // For now, just compile the inner value without wrapping with Unpack
+                    // This is a temporary solution until we figure out how to properly import typing
+                    self.compile_expression(value)?;
+                } else {
+                    return Err(self.error(CodegenErrorType::InvalidStarExpr));
+                }
             }
             Expr::If(ExprIf {
                 test, body, orelse, ..
diff --git a/vm/src/builtins/asyncgenerator.rs b/vm/src/builtins/asyncgenerator.rs
@@ -69,7 +69,7 @@ impl PyAsyncGen {
 
     #[pyclassmethod]
     fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
-        PyGenericAlias::new(cls, args, vm)
+        PyGenericAlias::from_args(cls, args, vm)
     }
 }
 
diff --git a/vm/src/builtins/dict.rs b/vm/src/builtins/dict.rs
@@ -322,7 +322,7 @@ impl PyDict {
 
     #[pyclassmethod]
     fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
-        PyGenericAlias::new(cls, args, vm)
+        PyGenericAlias::from_args(cls, args, vm)
     }
 }
 
diff --git a/vm/src/builtins/enumerate.rs b/vm/src/builtins/enumerate.rs
@@ -57,7 +57,7 @@ impl Constructor for PyEnumerate {
 impl PyEnumerate {
     #[pyclassmethod]
     fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
-        PyGenericAlias::new(cls, args, vm)
+        PyGenericAlias::from_args(cls, args, vm)
     }
 }
 
diff --git a/vm/src/builtins/genericalias.rs b/vm/src/builtins/genericalias.rs
@@ -63,7 +63,12 @@ impl Constructor for PyGenericAlias {
             return Err(vm.new_type_error("GenericAlias() takes no keyword arguments"));
         }
         let (origin, arguments): (_, PyObjectRef) = args.bind(vm)?;
-        PyGenericAlias::new(origin, arguments, vm)
+        let args = if let Ok(tuple) = arguments.try_to_ref::<PyTuple>(vm) {
+            tuple.to_owned()
+        } else {
+            PyTuple::new_ref(vec![arguments], &vm.ctx)
+        };
+        PyGenericAlias::new(origin, args, false, vm)
             .into_ref_with_type(vm, cls)
             .map(Into::into)
     }
@@ -84,35 +89,24 @@ impl Constructor for PyGenericAlias {
     flags(BASETYPE)
 )]
 impl PyGenericAlias {
-    pub fn new(origin: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> Self {
-        let args = if let Ok(tuple) = args.try_to_ref::<PyTuple>(vm) {
-            tuple.to_owned()
-        } else {
-            PyTuple::new_ref(vec![args], &vm.ctx)
-        };
-
+    pub fn new(origin: PyTypeRef, args: PyTupleRef, starred: bool, vm: &VirtualMachine) -> Self {
         let parameters = make_parameters(&args, vm);
         Self {
             origin,
             args,
             parameters,
-            starred: false, // default to false
+            starred,
         }
     }
 
-    fn with_tuple_args(
-        origin: PyTypeRef,
-        args: PyTupleRef,
-        starred: bool,
-        vm: &VirtualMachine,
-    ) -> Self {
-        let parameters = make_parameters(&args, vm);
-        Self {
-            origin,
-            args,
-            parameters,
-            starred,
-        }
+    /// Create a GenericAlias from an origin and PyObjectRef arguments (helper for compatibility)
+    pub fn from_args(origin: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> Self {
+        let args = if let Ok(tuple) = args.try_to_ref::<PyTuple>(vm) {
+            tuple.to_owned()
+        } else {
+            PyTuple::new_ref(vec![args], &vm.ctx)
+        };
+        Self::new(origin, args, false, vm)
     }
 
     fn repr(&self, vm: &VirtualMachine) -> PyResult<String> {
@@ -146,7 +140,7 @@ impl PyGenericAlias {
             }
         }
 
-        Ok(format!(
+        let repr_str = format!(
             "{}[{}]",
             repr_item(self.origin.clone().into(), vm)?,
             if self.args.is_empty() {
@@ -158,7 +152,14 @@ impl PyGenericAlias {
                     .collect::<PyResult<Vec<_>>>()?
                     .join(", ")
             }
-        ))
+        );
+
+        // Add * prefix if this is a starred GenericAlias
+        Ok(if self.starred {
+            format!("*{repr_str}")
+        } else {
+            repr_str
+        })
     }
 
     #[pygetset]
@@ -200,10 +201,7 @@ impl PyGenericAlias {
             vm,
         )?;
 
-        Ok(
-            PyGenericAlias::new(zelf.origin.clone(), new_args.to_pyobject(vm), vm)
-                .into_pyobject(vm),
-        )
+        Ok(PyGenericAlias::new(zelf.origin.clone(), new_args, false, vm).into_pyobject(vm))
     }
 
     #[pymethod]
@@ -598,7 +596,7 @@ impl Iterable for PyGenericAlias {
         // CPython's ga_iter creates an iterator that yields one starred GenericAlias
         // we don't have gaiterobject yet
 
-        let starred_alias = PyGenericAlias::with_tuple_args(
+        let starred_alias = PyGenericAlias::new(
             zelf.origin.clone(),
             zelf.args.clone(),
             true, // starred
diff --git a/vm/src/builtins/list.rs b/vm/src/builtins/list.rs
@@ -337,7 +337,7 @@ impl PyList {
 
     #[pyclassmethod]
     fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
-        PyGenericAlias::new(cls, args, vm)
+        PyGenericAlias::from_args(cls, args, vm)
     }
 }
 
diff --git a/vm/src/builtins/mappingproxy.rs b/vm/src/builtins/mappingproxy.rs
@@ -176,7 +176,7 @@ impl PyMappingProxy {
 
     #[pyclassmethod]
     fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
-        PyGenericAlias::new(cls, args, vm)
+        PyGenericAlias::from_args(cls, args, vm)
     }
 
     #[pymethod]
diff --git a/vm/src/builtins/set.rs b/vm/src/builtins/set.rs
@@ -790,7 +790,7 @@ impl PySet {
 
     #[pyclassmethod]
     fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
-        PyGenericAlias::new(cls, args, vm)
+        PyGenericAlias::from_args(cls, args, vm)
     }
 }
 
@@ -1134,7 +1134,7 @@ impl PyFrozenSet {
 
     #[pyclassmethod]
     fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
-        PyGenericAlias::new(cls, args, vm)
+        PyGenericAlias::from_args(cls, args, vm)
     }
 }
 
diff --git a/vm/src/builtins/tuple.rs b/vm/src/builtins/tuple.rs
@@ -343,7 +343,7 @@ impl PyTuple {
 
     #[pyclassmethod]
     fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
-        PyGenericAlias::new(cls, args, vm)
+        PyGenericAlias::from_args(cls, args, vm)
     }
 }
 
diff --git a/vm/src/builtins/weakref.rs b/vm/src/builtins/weakref.rs
@@ -55,7 +55,7 @@ impl Constructor for PyWeak {
 impl PyWeak {
     #[pyclassmethod]
     fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {
-        PyGenericAlias::new(cls, args, vm)
+        PyGenericAlias::from_args(cls, args, vm)
     }
 }
 
diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs
@@ -693,7 +693,7 @@ impl PyObject {
         } else {
             if self.class().fast_issubclass(vm.ctx.types.type_type) {
                 if self.is(vm.ctx.types.type_type) {
-                    return PyGenericAlias::new(self.class().to_owned(), needle, vm)
+                    return PyGenericAlias::from_args(self.class().to_owned(), needle, vm)
                         .to_pyresult(vm);
                 }
 
diff --git a/vm/src/stdlib/collections.rs b/vm/src/stdlib/collections.rs
@@ -415,7 +415,7 @@ mod _collections {
             args: PyObjectRef,
             vm: &VirtualMachine,
         ) -> PyGenericAlias {
-            PyGenericAlias::new(cls, args, vm)
+            PyGenericAlias::from_args(cls, args, vm)
         }
     }
 
diff --git a/vm/src/stdlib/itertools.rs b/vm/src/stdlib/itertools.rs
@@ -68,7 +68,7 @@ mod decl {
             args: PyObjectRef,
             vm: &VirtualMachine,
         ) -> PyGenericAlias {
-            PyGenericAlias::new(cls, args, vm)
+            PyGenericAlias::from_args(cls, args, vm)
         }
 
         #[pymethod]
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -592,7 +592,7 @@ pub(super) mod _os {
             args: PyObjectRef,
             vm: &VirtualMachine,
         ) -> PyGenericAlias {
-            PyGenericAlias::new(cls, args, vm)
+            PyGenericAlias::from_args(cls, args, vm)
         }
     }
 
diff --git a/vm/src/stdlib/sre.rs b/vm/src/stdlib/sre.rs
@@ -502,7 +502,7 @@ mod _sre {
             args: PyObjectRef,
             vm: &VirtualMachine,
         ) -> PyGenericAlias {
-            PyGenericAlias::new(cls, args, vm)
+            PyGenericAlias::from_args(cls, args, vm)
         }
     }
 
@@ -816,7 +816,7 @@ mod _sre {
             args: PyObjectRef,
             vm: &VirtualMachine,
         ) -> PyGenericAlias {
-            PyGenericAlias::new(cls, args, vm)
+            PyGenericAlias::from_args(cls, args, vm)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ struct Compiler<'src> {`
`80`	`80`	`ctx: CompileContext,`
`81`	`81`	`class_name: Option<String>,`
`82`	`82`	`opts: CompileOpts,`
	`83`	`+ in_annotation: bool,`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`enum DoneWithFuture {`
`@@ -335,6 +336,7 @@ impl<'src> Compiler<'src> {`
`335`	`336`	`},`
`336`	`337`	`class_name: None,`
`337`	`338`	`opts,`
	`339`	`+ in_annotation: false,`
`338`	`340`	`}`
`339`	`341`	`}`
`340`	`342`	`}`
`@@ -2897,7 +2899,11 @@ impl Compiler<'_> {`
`2897`	`2899`	`.into(),`
`2898`	`2900`	`});`
`2899`	`2901`	`} else {`
`2900`		`- self.compile_expression(annotation)?;`
	`2902`	`+ let was_in_annotation = self.in_annotation;`
	`2903`	`+ self.in_annotation = true;`
	`2904`	`+ let result = self.compile_expression(annotation);`
	`2905`	`+ self.in_annotation = was_in_annotation;`
	`2906`	`+ result?;`
`2901`	`2907`	`}`
`2902`	`2908`	`Ok(())`
`2903`	`2909`	`}`
`@@ -3504,8 +3510,15 @@ impl Compiler<'_> {`
`3504`	`3510`	`Self::contains_await(elt),`
`3505`	`3511`	`)?;`
`3506`	`3512`	`}`
`3507`		`- Expr::Starred(_) => {`
`3508`		`- return Err(self.error(CodegenErrorType::InvalidStarExpr));`
	`3513`	`+ Expr::Starred(ExprStarred { value, .. }) => {`
	`3514`	`+ if self.in_annotation {`
	`3515`	`+ // In annotation context, starred expressions are allowed (PEP 646)`
	`3516`	`+ // For now, just compile the inner value without wrapping with Unpack`
	`3517`	`+ // This is a temporary solution until we figure out how to properly import typing`
	`3518`	`+ self.compile_expression(value)?;`
	`3519`	`+ } else {`
	`3520`	`+ return Err(self.error(CodegenErrorType::InvalidStarExpr));`
	`3521`	`+ }`
`3509`	`3522`	`}`
`3510`	`3523`	`Expr::If(ExprIf {`
`3511`	`3524`	`test, body, orelse, ..`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ impl PyAsyncGen {`
`69`	`69`
`70`	`70`	`#[pyclassmethod]`
`71`	`71`	`fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {`
`72`		`- PyGenericAlias::new(cls, args, vm)`
	`72`	`+ PyGenericAlias::from_args(cls, args, vm)`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ impl PyDict {`
`322`	`322`
`323`	`323`	`#[pyclassmethod]`
`324`	`324`	`fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {`
`325`		`- PyGenericAlias::new(cls, args, vm)`
	`325`	`+ PyGenericAlias::from_args(cls, args, vm)`
`326`	`326`	`}`
`327`	`327`	`}`
`328`	`328`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ impl Constructor for PyEnumerate {`
`57`	`57`	`impl PyEnumerate {`
`58`	`58`	`#[pyclassmethod]`
`59`	`59`	`fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {`
`60`		`- PyGenericAlias::new(cls, args, vm)`
	`60`	`+ PyGenericAlias::from_args(cls, args, vm)`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ impl PyList {`
`337`	`337`
`338`	`338`	`#[pyclassmethod]`
`339`	`339`	`fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {`
`340`		`- PyGenericAlias::new(cls, args, vm)`
	`340`	`+ PyGenericAlias::from_args(cls, args, vm)`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ impl PyMappingProxy {`
`176`	`176`
`177`	`177`	`#[pyclassmethod]`
`178`	`178`	`fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {`
`179`		`- PyGenericAlias::new(cls, args, vm)`
	`179`	`+ PyGenericAlias::from_args(cls, args, vm)`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`#[pymethod]`
Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,7 @@ impl PySet {`
`790`	`790`
`791`	`791`	`#[pyclassmethod]`
`792`	`792`	`fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {`
`793`		`- PyGenericAlias::new(cls, args, vm)`
	`793`	`+ PyGenericAlias::from_args(cls, args, vm)`
`794`	`794`	`}`
`795`	`795`	`}`
`796`	`796`
`@@ -1134,7 +1134,7 @@ impl PyFrozenSet {`
`1134`	`1134`
`1135`	`1135`	`#[pyclassmethod]`
`1136`	`1136`	`fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {`
`1137`		`- PyGenericAlias::new(cls, args, vm)`
	`1137`	`+ PyGenericAlias::from_args(cls, args, vm)`
`1138`	`1138`	`}`
`1139`	`1139`	`}`
`1140`	`1140`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ impl PyTuple {`
`343`	`343`
`344`	`344`	`#[pyclassmethod]`
`345`	`345`	`fn __class_getitem__(cls: PyTypeRef, args: PyObjectRef, vm: &VirtualMachine) -> PyGenericAlias {`
`346`		`- PyGenericAlias::new(cls, args, vm)`
	`346`	`+ PyGenericAlias::from_args(cls, args, vm)`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`