Skip to content

gh-120722: Propogate instruction location in optimization of LOAD_CONST + RETURN_VALUE with RETURN_CONST #120723

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

Closed
blhsing wants to merge 3 commits into from
Closed

gh-120722: Propogate instruction location in optimization of LOAD_CONST + RETURN_VALUE with RETURN_CONST #120723

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
10bf8d7
gh-120722: propogate instruction location in RETURN_VALUE optimizatio…
blhsing Jun 19, 2024
3a7e863
gh-120722: added test
blhsing Jun 19, 2024
482fa17
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 19, 2024
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
9 changes: 9 additions & 0 deletions Lib/test/test_compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2028,6 +2028,15 @@ def test_load_super_attr(self):
code, "LOAD_GLOBAL", line=3, end_line=3, column=4, end_column=9
)

def test_constant_lambda(self):
namespace = {}
source = "f = lambda: 1"
code = compile(source, "<test>", "exec")
exec(code, namespace)
self.assertOpcodeSourcePositionIs(
namespace["f"].__code__, "RETURN_CONST", line=1, end_line=1,
column=12, end_column=13
)

class TestExpectedAttributes(unittest.TestCase):

Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2024-06-19-05-32-32.gh-issue-120722.4ZDtZr.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed an issue where the ``RETURN_CONST`` instruction in the code object of a lambda function returning a constant value was not accompanied with correct location information.
13 changes: 12 additions & 1 deletion Python/flowgraph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,16 @@ is_jump(cfg_instr *i)
_instr__ptr_->i_oparg = (ARG); \
} while (0);

/* One arg with location*/
#define INSTR_SET_OP1_LOC(I, OP, ARG, LOC) \
do { \
assert(OPCODE_HAS_ARG(OP)); \
cfg_instr *_instr__ptr_ = (I); \
_instr__ptr_->i_opcode = (OP); \
_instr__ptr_->i_oparg = (ARG); \
_instr__ptr_->i_loc = (LOC); \
} while (0);

/* No args*/
#define INSTR_SET_OP0(I, OP) \
do { \
Expand Down Expand Up @@ -1661,7 +1671,8 @@ basicblock_optimize_load_const(PyObject *const_cache, basicblock *bb, PyObject *
case RETURN_VALUE:
{
INSTR_SET_OP0(inst, NOP);
INSTR_SET_OP1(&bb->b_instr[++i], RETURN_CONST, oparg);
INSTR_SET_OP1_LOC(&bb->b_instr[++i], RETURN_CONST, oparg,
inst->i_loc);
break;
}
case TO_BOOL:
Expand Down