gh-123142: fix too wide source location of GET_ITER/GET_AITER (#123420)

This commit is contained in:
Irit Katriel 2024-08-28 17:11:52 +01:00 committed by GitHub
parent 40fff90ae3
commit 61bef6245c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 40 additions and 9 deletions

View file

@ -2990,7 +2990,7 @@ codegen_async_for(struct compiler *c, stmt_ty s)
NEW_JUMP_TARGET_LABEL(c, end);
VISIT(c, expr, s->v.AsyncFor.iter);
ADDOP(c, loc, GET_AITER);
ADDOP(c, LOC(s->v.AsyncFor.iter), GET_AITER);
USE_LABEL(c, start);
RETURN_IF_ERROR(compiler_push_fblock(c, loc, FOR_LOOP, start, end, NULL));
@ -5284,7 +5284,7 @@ codegen_async_comprehension_generator(struct compiler *c, location loc,
else {
/* Sub-iter - calculate on the fly */
VISIT(c, expr, gen->iter);
ADDOP(c, loc, GET_AITER);
ADDOP(c, LOC(gen->iter), GET_AITER);
}
}
@ -5618,15 +5618,14 @@ pop_inlined_comprehension_state(struct compiler *c, location loc,
}
static inline int
codegen_comprehension_iter(struct compiler *c, location loc,
comprehension_ty comp)
codegen_comprehension_iter(struct compiler *c, comprehension_ty comp)
{
VISIT(c, expr, comp->iter);
if (comp->is_async) {
ADDOP(c, loc, GET_AITER);
ADDOP(c, LOC(comp->iter), GET_AITER);
}
else {
ADDOP(c, loc, GET_ITER);
ADDOP(c, LOC(comp->iter), GET_ITER);
}
return SUCCESS;
}
@ -5654,7 +5653,7 @@ codegen_comprehension(struct compiler *c, expr_ty e, int type,
outermost = (comprehension_ty) asdl_seq_GET(generators, 0);
if (is_inlined) {
if (codegen_comprehension_iter(c, loc, outermost)) {
if (codegen_comprehension_iter(c, outermost)) {
goto error;
}
if (push_inlined_comprehension_state(c, loc, entry, &inline_state)) {
@ -5736,7 +5735,7 @@ codegen_comprehension(struct compiler *c, expr_ty e, int type,
}
Py_CLEAR(co);
if (codegen_comprehension_iter(c, loc, outermost)) {
if (codegen_comprehension_iter(c, outermost)) {
goto error;
}