[Python-checkins] gh-104584: Fix assert in DEOPT macro -- should fix buildbot (#106131)

gvanrossum webhook-mailer at python.org
Tue Jun 27 10:02:54 EDT 2023


https://github.com/python/cpython/commit/bb578a0c304dffe43bb28b36b2b1c9153c78b659
commit: bb578a0c304dffe43bb28b36b2b1c9153c78b659
branch: main
author: Guido van Rossum <guido at python.org>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2023-06-27T07:02:51-07:00
summary:

gh-104584: Fix assert in DEOPT macro -- should fix buildbot (#106131)

files:
M Python/ceval_macros.h

diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
index 0d41ef5a14ce..f5c78fc65e17 100644
--- a/Python/ceval_macros.h
+++ b/Python/ceval_macros.h
@@ -264,11 +264,12 @@ GETITEM(PyObject *v, Py_ssize_t i) {
 #define UPDATE_MISS_STATS(INSTNAME) ((void)0)
 #endif
 
+// NOTE: in the uops version, opcode may be > 255
 #define DEOPT_IF(COND, INSTNAME)                            \
     if ((COND)) {                                           \
         /* This is only a single jump on release builds! */ \
         UPDATE_MISS_STATS((INSTNAME));                      \
-        assert(_PyOpcode_Deopt[opcode] == (INSTNAME));      \
+        assert(opcode >= 256 || _PyOpcode_Deopt[opcode] == (INSTNAME)); \
         GO_TO_INSTRUCTION(INSTNAME);                        \
     }
 



More information about the Python-checkins mailing list