https://github.com/python/cpython/commit/65f8eb71190f870c66fb00da29a670ee232a3fd5
commit: 65f8eb71190f870c66fb00da29a670ee232a3fd5
branch: main
author: Guido van Rossum <[email protected]>
committer: gvanrossum <[email protected]>
date: 2024-01-09T18:18:11Z
summary:
Fix opcode name printing in debug mode (#113870)
Fix a few places where the lltrace debug output printed ``(null)`` instead of
an opcode name, because it was calling ``_PyUOpName()`` on a Tier-1 opcode.
files:
M Python/optimizer.c
diff --git a/Python/optimizer.c b/Python/optimizer.c
index f27af14d967cd3..ad5b4994318d44 100644
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -2,7 +2,7 @@
#include "opcode.h"
#include "pycore_interp.h"
#include "pycore_bitutils.h" // _Py_popcount32()
-#include "pycore_opcode_metadata.h" // _PyOpcode_OpName()
+#include "pycore_opcode_metadata.h" // _PyOpcode_OpName[]
#include "pycore_opcode_utils.h" // MAX_REAL_OPCODE
#include "pycore_optimizer.h" // _Py_uop_analyze_and_optimize()
#include "pycore_pystate.h" // _PyInterpreterState_GET()
@@ -563,7 +563,7 @@ translate_bytecode_to_trace(
uint32_t uopcode = BRANCH_TO_GUARD[opcode -
POP_JUMP_IF_FALSE][jump_likely];
_Py_CODEUNIT *next_instr = instr + 1 +
_PyOpcode_Caches[_PyOpcode_Deopt[opcode]];
DPRINTF(2, "%s(%d): counter=%x, bitcount=%d, likely=%d,
confidence=%d, uopcode=%s\n",
- _PyUOpName(opcode), oparg,
+ _PyOpcode_OpName[opcode], oparg,
counter, bitcount, jump_likely, confidence,
_PyUOpName(uopcode));
ADD_TO_TRACE(uopcode, max_length, 0, target);
if (jump_likely) {
@@ -722,7 +722,7 @@ translate_bytecode_to_trace(
}
break;
}
- DPRINTF(2, "Unsupported opcode %s\n", _PyUOpName(opcode));
+ DPRINTF(2, "Unsupported opcode %s\n",
_PyOpcode_OpName[opcode]);
OPT_UNSUPPORTED_OPCODE(opcode);
goto done; // Break out of loop
} // End default
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
