Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

[3.13] gh-123142: fix too wide source location of GET_ITER/GET_AITER (GH-123420). (#123435) 

(cherry picked from commit 61bef6245c)
This commit is contained in:
Irit Katriel 2024-08-28 18:41:22 +01:00 committed by GitHub
parent 19a1f18740
commit d379a92ddc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/support/__init__.py
View File

@ -2676,14 +2676,17 @@ def initialized_with_pyrepl():
class BrokenIter:
def __init__(self, init_raises=False, next_raises=False):
def __init__(self, init_raises=False, next_raises=False, iter_raises=False):
if init_raises:
1/0
self.next_raises = next_raises
self.iter_raises = iter_raises
def __next__(self):
if self.next_raises:
1/0
def __iter__(self):
if self.iter_raises:
1/0
return self

7
Lib/test/test_dictcomps.py
View File

@ -145,8 +145,15 @@ class DictComprehensionTest(unittest.TestCase):
except Exception as e:
return e
def iter_raises():
try:
{x:x for x in BrokenIter(iter_raises=True)}
except Exception as e:
return e
for func, expected in [(init_raises, "BrokenIter(init_raises=True)"),
(next_raises, "BrokenIter(next_raises=True)"),
(iter_raises, "BrokenIter(iter_raises=True)"),
]:
with self.subTest(func):
exc = func()

8
Lib/test/test_iter.py
View File

@ -1163,8 +1163,16 @@ class TestCase(unittest.TestCase):
except Exception as e:
return e
def iter_raises():
try:
for x in BrokenIter(iter_raises=True):
pass
except Exception as e:
return e
for func, expected in [(init_raises, "BrokenIter(init_raises=True)"),
(next_raises, "BrokenIter(next_raises=True)"),
(iter_raises, "BrokenIter(iter_raises=True)"),
]:
with self.subTest(func):
exc = func()

7
Lib/test/test_listcomps.py
View File

@ -730,8 +730,15 @@ class ListComprehensionTest(unittest.TestCase):
except Exception as e:
return e
def iter_raises():
try:
[x for x in BrokenIter(iter_raises=True)]
except Exception as e:
return e
for func, expected in [(init_raises, "BrokenIter(init_raises=True)"),
(next_raises, "BrokenIter(next_raises=True)"),
(iter_raises, "BrokenIter(iter_raises=True)"),
]:
with self.subTest(func):
exc = func()

7
Lib/test/test_setcomps.py
View File

@ -168,8 +168,15 @@ class SetComprehensionTest(unittest.TestCase):
except Exception as e:
return e
def iter_raises():
try:
{x for x in BrokenIter(iter_raises=True)}
except Exception as e:
return e
for func, expected in [(init_raises, "BrokenIter(init_raises=True)"),
(next_raises, "BrokenIter(next_raises=True)"),
(iter_raises, "BrokenIter(iter_raises=True)"),
]:
with self.subTest(func):
exc = func()

15
Python/compile.c
View File

@ -3160,7 +3160,7 @@ compiler_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));
@ -5484,7 +5484,7 @@ compiler_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);
}
}
@ -5774,15 +5774,14 @@ pop_inlined_comprehension_state(struct compiler *c, location loc,
}
static inline int
compiler_comprehension_iter(struct compiler *c, location loc,
comprehension_ty comp)
compiler_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;
}
@ -5808,7 +5807,7 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
outermost = (comprehension_ty) asdl_seq_GET(generators, 0);
if (is_inlined) {
if (compiler_comprehension_iter(c, loc, outermost)) {
if (compiler_comprehension_iter(c, outermost)) {
goto error;
}
if (push_inlined_comprehension_state(c, loc, entry, &inline_state)) {
@ -5894,7 +5893,7 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
}
Py_CLEAR(co);
if (compiler_comprehension_iter(c, loc, outermost)) {
if (compiler_comprehension_iter(c, outermost)) {
goto error;
}