bpo-37947: Adjust correctly the recursion level in symtable for named expressions (GH-15499)

pablogsal · web-flow · commit 0e4ea1633668 · 2019-08-26T15:52:25.000+01:00
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-08-26-04-09-57.bpo-37947.mzAQtB.rst b/Misc/NEWS.d/next/Core and Builtins/2019-08-26-04-09-57.bpo-37947.mzAQtB.rst
@@ -0,0 +1,2 @@
+Adjust correctly the recursion level in the symtable generation for named
+expressions. Patch by Pablo Galindo.
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -1508,6 +1508,7 @@ symtable_handle_namedexpr(struct symtable *st, expr_ty e)
     }
     VISIT(st, expr, e->v.NamedExpr.value);
     VISIT(st, expr, e->v.NamedExpr.target);
+    VISIT_QUIT(st, 1);
 }
 
 static int
@@ -1520,7 +1521,8 @@ symtable_visit_expr(struct symtable *st, expr_ty e)
     }
     switch (e->kind) {
     case NamedExpr_kind:
-        symtable_handle_namedexpr(st, e);
+        if(!symtable_handle_namedexpr(st, e))
+            VISIT_QUIT(st, 0);
         break;
     case BoolOp_kind:
         VISIT_SEQ(st, expr, e->v.BoolOp.values);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Adjust correctly the recursion level in the symtable generation for named`
	`2`	`+expressions. Patch by Pablo Galindo.`
Original file line number	Diff line number	Diff line change
`@@ -1508,6 +1508,7 @@ symtable_handle_namedexpr(struct symtable *st, expr_ty e)`
`1508`	`1508`	`}`
`1509`	`1509`	`VISIT(st, expr, e->v.NamedExpr.value);`
`1510`	`1510`	`VISIT(st, expr, e->v.NamedExpr.target);`
	`1511`	`+ VISIT_QUIT(st, 1);`
`1511`	`1512`	`}`
`1512`	`1513`
`1513`	`1514`	`static int`
`@@ -1520,7 +1521,8 @@ symtable_visit_expr(struct symtable *st, expr_ty e)`
`1520`	`1521`	`}`
`1521`	`1522`	`switch (e->kind) {`
`1522`	`1523`	`case NamedExpr_kind:`
`1523`		`- symtable_handle_namedexpr(st, e);`
	`1524`	`+ if(!symtable_handle_namedexpr(st, e))`
	`1525`	`+ VISIT_QUIT(st, 0);`
`1524`	`1526`	`break;`
`1525`	`1527`	`case BoolOp_kind:`
`1526`	`1528`	`VISIT_SEQ(st, expr, e->v.BoolOp.values);`