Use _PyST_IsFunctionLike in comprehension inlining code

JelleZijlstra · JelleZijlstra · commit be70e3cd91f7 · 2023-05-10T18:30:11.000-07:00
diff --git a/Lib/test/test_type_params.py b/Lib/test/test_type_params.py
@@ -391,6 +391,12 @@ class Child[T](Base[lambda: (int, outer_var, T)]): ...
         T, = Child.__type_params__
         self.assertEqual(func(), (int, "outer", T))
 
+    def test_comprehension_01(self):
+        type Alias[T: ([T for T in (T, [1])[1]], T)] = [T for T in T.__name__]
+        self.assertEqual(Alias.__value__, ["T"])
+        T, = Alias.__type_params__
+        self.assertEqual(T.__constraints__, ([1], T))
+
 
 def global_generic_func[T]():
     pass
diff --git a/Python/compile.c b/Python/compile.c
@@ -5420,7 +5420,7 @@ push_inlined_comprehension_state(struct compiler *c, location loc,
         // assignment expression to a nonlocal in the comprehension, these don't
         // need handling here since they shouldn't be isolated
         if (symbol & DEF_LOCAL && !(symbol & DEF_NONLOCAL)) {
-            if (c->u->u_ste->ste_type != FunctionBlock) {
+            if (!_PyST_IsFunctionLike(c->u->u_ste)) {
                 // non-function scope: override this name to use fast locals
                 PyObject *orig = PyDict_GetItem(c->u->u_metadata.u_fasthidden, k);
                 if (orig != Py_True) {
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -648,7 +648,7 @@ inline_comprehension(PySTEntryObject *ste, PySTEntryObject *comp,
             if (PyLong_AsLong(existing) & DEF_BOUND) {
                 // cell vars in comprehension that are locals in outer scope
                 // must be promoted to cell so u_cellvars isn't wrong
-                if (scope == CELL && ste->ste_type == FunctionBlock) {
+                if (scope == CELL && _PyST_IsFunctionLike(ste)) {
                     SET_SCOPE(scopes, k, scope);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ inline_comprehension(PySTEntryObject ste, PySTEntryObject comp,`
`648`	`648`	`if (PyLong_AsLong(existing) & DEF_BOUND) {`
`649`	`649`	`// cell vars in comprehension that are locals in outer scope`
`650`	`650`	`// must be promoted to cell so u_cellvars isn't wrong`
`651`		`- if (scope == CELL && ste->ste_type == FunctionBlock) {`
	`651`	`+ if (scope == CELL && _PyST_IsFunctionLike(ste)) {`
`652`	`652`	`SET_SCOPE(scopes, k, scope);`
`653`	`653`	`}`
`654`	`654`