GH-104584: Fix incorrect uoperands (GH-107513)

python · Jul 31, 2023 · 5e584eb · 5e584eb
1 parent de51ded
commit 5e584eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-07-29-22-01-30.gh-issue-104584.tINuoA.rst b/Misc/NEWS.d/next/Core and Builtins/2023-07-29-22-01-30.gh-issue-104584.tINuoA.rst
@@ -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.
diff --git a/Python/optimizer.c b/Python/optimizer.c
@@ -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)) {
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.