mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-08 03:45:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

GH-95921: Fix positions for some chained comparisons (GH-96968)

Browse source
This commit is contained in:
Brandt Bucher 2022-09-20 12:22:24 -07:00 • committed by GitHub
parent 8563966be4
commit dfc73b5724
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Lib/test/test_compile.py
View file

@ -1077,6 +1077,31 @@ if 1:
check_op_count(aug, "STORE_SLICE", 1)
check_op_count(aug, "BUILD_SLICE", 0)
def test_compare_positions(self):
for opname, op in [
("COMPARE_OP", "<"),
("COMPARE_OP", "<="),
("COMPARE_OP", ">"),
("COMPARE_OP", ">="),
("CONTAINS_OP", "in"),
("CONTAINS_OP", "not in"),
("IS_OP", "is"),
("IS_OP", "is not"),
]:
expr = f'a {op} b {op} c'
expected_positions = 2 * [(2, 2, 0, len(expr))]
for source in [
f"\\\n{expr}", f'if \\\n{expr}: x', f"x if \\\n{expr} else y"
]:
code = compile(source, "<test>", "exec")
actual_positions = [
instruction.positions
for instruction in dis.get_instructions(code)
if instruction.opname == opname
]
with self.subTest(source):
self.assertEqual(actual_positions, expected_positions)
@requires_debug_ranges()
class TestSourcePositions(unittest.TestCase):

2
Misc/NEWS.d/next/Core and Builtins/2022-09-20-11-06-45.gh-issue-95921.dkcRQn.rst Normal file
View file

@ -0,0 +1,2 @@
Fix overly-broad source position information for chained comparisons used as
branching conditions.

1
Python/compile.c
View file

@ -2905,6 +2905,7 @@ compiler_jump_if(struct compiler *c, expr_ty e, jump_target_label next, int cond
return 1;
}
case Compare_kind: {
SET_LOC(c, e);
Py_ssize_t i, n = asdl_seq_LEN(e->v.Compare.ops) - 1;
if (n > 0) {
if (!check_compare(c, e)) {