Address code review feedback from #7481

- Set is_generator flag for generator expressions in scan_comprehension - Fix posonlyargs priority in collect_static_attributes first param - Add match statement support to scan_store_attrs - Fix stale decorator stack comment - Reorder NOP removal after fold_unary_negative for better collection folding
youknowone · Mar 25, 2026 · Mar 23, 2026 · Mar 23, 2026 · Mar 23, 2026 · Mar 23, 2026
commit 296eaa1e96bbefb71c209a4a00facbf2273e6024
diff --git a/crates/codegen/src/compile.rs b/crates/codegen/src/compile.rs
@@ -2775,7 +2775,7 @@ impl Compiler {
     }
 
     /// Push decorators onto the stack in source order.
-    /// For @dec1 @dec2 def foo(): stack becomes [dec1, NULL, dec2, NULL]
+    /// For @dec1 @dec2 def foo(): stack becomes [dec1, dec2]
     fn prepare_decorators(&mut self, decorator_list: &[ast::Decorator]) -> CompileResult<()> {
         for decorator in decorator_list {
             self.compile_expression(&decorator.expression)?;
@@ -4547,9 +4547,9 @@ impl Compiler {
             }
             let first_param = f
                 .parameters
-                .args
+                .posonlyargs
                 .first()
-                .or(f.parameters.posonlyargs.first())
+                .or(f.parameters.args.first())
                 .map(|p| &p.parameter.name);
             let Some(self_name) = first_param else {
                 continue;
@@ -4632,6 +4632,11 @@ impl Compiler {
                 ast::Stmt::With(s) => {
                     Self::scan_store_attrs(&s.body, name, attrs);
                 }
+                ast::Stmt::Match(s) => {
+                    for case in &s.cases {
+                        Self::scan_store_attrs(&case.body, name, attrs);
+                    }
+                }
                 _ => {}
             }
         }

diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs
@@ -191,10 +191,11 @@ impl CodeInfo {
     ) -> crate::InternalResult<CodeObject> {
         // Constant folding passes
         self.fold_unary_negative();
+        self.remove_nops(); // remove NOPs from unary folding so tuple/list/set see contiguous LOADs
         self.fold_tuple_constants();
         self.fold_list_constants();
         self.fold_set_constants();
-        self.remove_nops(); // remove NOPs from folding before iterable optimization
+        self.remove_nops(); // remove NOPs from collection folding
         self.fold_const_iterable_for_iter();
         self.convert_to_load_small_int();
         self.remove_unused_consts();

diff --git a/crates/codegen/src/symboltable.rs b/crates/codegen/src/symboltable.rs
@@ -2136,6 +2136,8 @@ impl SymbolTableBuilder {
             CompilerScope::Comprehension,
             self.line_index_start(range),
         );
+        // Generator expressions need the is_generator flag
+        self.tables.last_mut().unwrap().is_generator = is_generator;
 
         // PEP 709: Mark non-generator comprehensions for inlining,
         // but only inside function-like scopes (fastlocals).