Factor out IS_RETURN_OPCODE().

Author: ericsnowcurrently

Include/internal/pycore_opcode_utils.h

@@ -54,6 +54,9 @@ extern "C" {
          (opcode) == RAISE_VARARGS || \
          (opcode) == RERAISE)
 
+#define IS_RETURN_OPCODE(opcode) \
+        (opcode == RETURN_VALUE)
+
 
 /* Flags used in the oparg for MAKE_FUNCTION */
 #define MAKE_FUNCTION_DEFAULTS    0x01

Objects/codeobject.c

@@ -1715,7 +1715,7 @@ _PyCode_ReturnsValue(PyCodeObject *co)
     Py_ssize_t len = Py_SIZE(co);
     for (int i = 0; i < len; i++) {
         _Py_CODEUNIT inst = _Py_GetBaseCodeUnit(co, i);
-        if (inst.op.code == RETURN_VALUE) {
+        if (IS_RETURN_OPCODE(inst.op.code)) {
             assert(i != 0);
             // Ignore it if it returns None.
             _Py_CODEUNIT prev = _Py_GetBaseCodeUnit(co, i-1);

Python/flowgraph.c

@@ -295,7 +295,7 @@ dump_instr(cfg_instr *i)
 static inline int
 basicblock_returns(const basicblock *b) {
     cfg_instr *last = basicblock_last_instr(b);
-    return last && last->i_opcode == RETURN_VALUE;
+    return last && IS_RETURN_OPCODE(last->i_opcode);
 }
 
 static void