mirror of
https://github.com/python/cpython.git
synced 2025-07-27 21:24:32 +00:00
Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation.
This commit is contained in:
parent
63597f129d
commit
0e07b60a4e
5 changed files with 20 additions and 4 deletions
|
@ -339,7 +339,7 @@ set_context(expr_ty e, expr_context_ty ctx, const node *n)
|
|||
/* The ast defines augmented store and load contexts, but the
|
||||
implementation here doesn't actually use them. The code may be
|
||||
a little more complex than necessary as a result. It also means
|
||||
that expressions in an augmented assignment have no context.
|
||||
that expressions in an augmented assignment have a Store context.
|
||||
Consider restructuring so that augmented assignment uses
|
||||
set_context(), too.
|
||||
*/
|
||||
|
@ -1901,7 +1901,7 @@ ast_for_expr_stmt(struct compiling *c, const node *n)
|
|||
|
||||
if (!expr1)
|
||||
return NULL;
|
||||
/* TODO(jhylton): Figure out why set_context() can't be used here. */
|
||||
/* TODO(nas): Remove duplicated error checks (set_context does it) */
|
||||
switch (expr1->kind) {
|
||||
case GeneratorExp_kind:
|
||||
ast_error(ch, "augmented assignment to generator "
|
||||
|
@ -1923,6 +1923,7 @@ ast_for_expr_stmt(struct compiling *c, const node *n)
|
|||
"assignment");
|
||||
return NULL;
|
||||
}
|
||||
set_context(expr1, Store, ch);
|
||||
|
||||
ch = CHILD(n, 2);
|
||||
if (TYPE(ch) == testlist)
|
||||
|
|
|
@ -3688,7 +3688,8 @@ compiler_augassign(struct compiler *c, stmt_ty s)
|
|||
VISIT(c, expr, auge);
|
||||
break;
|
||||
case Name_kind:
|
||||
VISIT(c, expr, s->v.AugAssign.target);
|
||||
if (!compiler_nameop(c, e->v.Name.id, Load))
|
||||
return 0;
|
||||
VISIT(c, expr, s->v.AugAssign.value);
|
||||
ADDOP(c, inplace_binop(c, s->v.AugAssign.op));
|
||||
return compiler_nameop(c, e->v.Name.id, Store);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue