Skip to content
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

GH-104584: Fix incorrect uoperands #107513

Merged
merged 3 commits into from
Jul 31, 2023
Merged

GH-104584: Fix incorrect uoperands #107513

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
f274c05
Fix off-by-one error
brandtbucher Jul 30, 2023
2c2b847
blurb add
brandtbucher Jul 30, 2023
e189369
fixup
brandtbucher Jul 30, 2023
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-07-29-22-01-30.gh-issue-104584.tINuoA.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix an issue which caused incorrect inline caches to be read when running
with :envvar:`PYTHONUOPS` or :option:`-X uops <-X>` enabled.
3 changes: 2 additions & 1 deletion Python/optimizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,8 @@ translate_bytecode_to_trace(
for (int i = 0; i < nuops; i++) {
oparg = orig_oparg;
uint64_t operand = 0;
int offset = expansion->uops[i].offset;
// Add one to account for the actual opcode/oparg pair:
int offset = expansion->uops[i].offset + 1;
switch (expansion->uops[i].size) {
case OPARG_FULL:
if (extras && OPCODE_HAS_JUMP(opcode)) {
Expand Down