https://github.com/python/cpython/commit/0181aa2e3efedc6504b27f6fe74f096e5e454286
commit: 0181aa2e3efedc6504b27f6fe74f096e5e454286
branch: 3.12
author: Irit Katriel <[email protected]>
committer: iritkatriel <[email protected]>
date: 2024-08-28T18:41:40+01:00
summary:
[3.12] gh-123142: fix too wide source location of GET_ITER/GET_AITER
(GH-123420). (#123436)
(cherry picked from commit 61bef6245c4a32bf430d684ede8603f423d63284)
files:
M Lib/test/support/__init__.py
M Lib/test/test_dictcomps.py
M Lib/test/test_iter.py
M Lib/test/test_listcomps.py
M Lib/test/test_setcomps.py
M Python/compile.c
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index e2310627414797..9a56faa648bfb1 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2472,14 +2472,17 @@ def is_slot_wrapper(name, value):
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
diff --git a/Lib/test/test_dictcomps.py b/Lib/test/test_dictcomps.py
index e9df2967627240..26b56dac5032fa 100644
--- a/Lib/test/test_dictcomps.py
+++ b/Lib/test/test_dictcomps.py
@@ -145,8 +145,15 @@ def next_raises():
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()
diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
index 502856e3e2fbe0..1b9f3cf76240ad 100644
--- a/Lib/test/test_iter.py
+++ b/Lib/test/test_iter.py
@@ -1163,8 +1163,16 @@ def next_raises():
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()
diff --git a/Lib/test/test_listcomps.py b/Lib/test/test_listcomps.py
index bb99c94e942fff..2065afd455de5c 100644
--- a/Lib/test/test_listcomps.py
+++ b/Lib/test/test_listcomps.py
@@ -725,8 +725,15 @@ def next_raises():
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()
diff --git a/Lib/test/test_setcomps.py b/Lib/test/test_setcomps.py
index ba4173cd6a7dd7..0bb02ef11f6b4b 100644
--- a/Lib/test/test_setcomps.py
+++ b/Lib/test/test_setcomps.py
@@ -168,8 +168,15 @@ def next_raises():
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()
diff --git a/Python/compile.c b/Python/compile.c
index f63ee8293d9cf9..566e755c4d5040 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -3069,7 +3069,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));
@@ -5367,7 +5367,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);
}
}
@@ -5652,15 +5652,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;
}
@@ -5686,7 +5685,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)) {
@@ -5772,7 +5771,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;
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
