Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-98398: Fix source locations for 'assert' bytecode #98405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 19, 2022
Merged

gh-98398: Fix source locations for 'assert' bytecode #98405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c5b6e4
gh-98398: Fix source locations for 'assert' bytecode
iritkatriel Oct 18, 2022
a93d937
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 18, 2022
0f9b503
Merge remote-tracking branch 'upstream/main' into assert_lineno
iritkatriel Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion Lib/test/test_compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,6 @@ def test_multiline_boolean_expression(self):
d > 0)):
x = 42
"""

compiled_code, _ = self.check_positions_against_ast(snippet)
# jump if a is true:
self.assertOpcodeSourcePositionIs(compiled_code, 'POP_JUMP_IF_TRUE',
Expand All @@ -1233,6 +1232,23 @@ def test_multiline_boolean_expression(self):
self.assertOpcodeSourcePositionIs(compiled_code, 'POP_JUMP_IF_TRUE',
line=4, end_line=4, column=8, end_column=13, occurrence=2)

def test_multiline_assert(self):
snippet = """\
assert (a > 0 and
bb > 0 and
ccc == 4), "error msg"
"""
compiled_code, _ = self.check_positions_against_ast(snippet)
self.assertOpcodeSourcePositionIs(compiled_code, 'LOAD_ASSERTION_ERROR',
line=1, end_line=3, column=0, end_column=30, occurrence=1)
# The "error msg":
self.assertOpcodeSourcePositionIs(compiled_code, 'LOAD_CONST',
line=3, end_line=3, column=19, end_column=30, occurrence=4)
self.assertOpcodeSourcePositionIs(compiled_code, 'CALL',
line=1, end_line=3, column=0, end_column=30, occurrence=1)
self.assertOpcodeSourcePositionIs(compiled_code, 'RAISE_VARARGS',
line=1, end_line=3, column=0, end_column=30, occurrence=1)

def test_very_long_line_end_offset(self):
# Make sure we get the correct column offset for offsets
# too large to store in a byte.
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-10-18-16-17-44.gh-issue-98398.x4rYK_.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix source location of 'assert' bytecodes.
18 changes: 10 additions & 8 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3960,31 +3960,33 @@ compiler_from_import(struct compiler *c, stmt_ty s)
static int
compiler_assert(struct compiler *c, stmt_ty s)
{
location loc = LOC(s);
/* Always emit a warning if the test is a non-zero length tuple */
if ((s->v.Assert.test->kind == Tuple_kind &&
asdl_seq_LEN(s->v.Assert.test->v.Tuple.elts) > 0) ||
(s->v.Assert.test->kind == Constant_kind &&
PyTuple_Check(s->v.Assert.test->v.Constant.value) &&
PyTuple_Size(s->v.Assert.test->v.Constant.value) > 0))
{
if (!compiler_warn(c, loc, "assertion is always true, "
"perhaps remove parentheses?"))
if (!compiler_warn(c, LOC(s), "assertion is always true, "
"perhaps remove parentheses?"))
{
return 0;
}
}
if (c->c_optimize)
if (c->c_optimize) {
return 1;
}
NEW_JUMP_TARGET_LABEL(c, end);
if (!compiler_jump_if(c, &loc, s->v.Assert.test, end, 1))
location loc = LOC(s);
if (!compiler_jump_if(c, &loc, s->v.Assert.test, end, 1)) {
return 0;
ADDOP(c, loc, LOAD_ASSERTION_ERROR);
}
ADDOP(c, LOC(s), LOAD_ASSERTION_ERROR);
if (s->v.Assert.msg) {
VISIT(c, expr, s->v.Assert.msg);
ADDOP_I(c, loc, CALL, 0);
ADDOP_I(c, LOC(s), CALL, 0);
}
ADDOP_I(c, loc, RAISE_VARARGS, 1);
ADDOP_I(c, LOC(s), RAISE_VARARGS, 1);

USE_LABEL(c, end);
return 1;
Expand Down