Tidy up test for conditional opcodes

Author: markshannon

Include/internal/pycore_opcode_utils.h

@@ -45,6 +45,12 @@ extern "C" {
          (opcode) == JUMP_BACKWARD || \
          (opcode) == JUMP_BACKWARD_NO_INTERRUPT)
 
+#define IS_CONDITIONAL_JUMP_OPCODE(opcode) \
+        ((opcode) == POP_JUMP_IF_FALSE || \
+         (opcode) == POP_JUMP_IF_TRUE || \
+         (opcode) == POP_JUMP_IF_NONE || \
+         (opcode) == POP_JUMP_IF_NOT_NONE)
+
 #define IS_SCOPE_EXIT_OPCODE(opcode) \
         ((opcode) == RETURN_VALUE || \
          (opcode) == RAISE_VARARGS || \

Python/codegen.c

@@ -409,13 +409,8 @@ codegen_addop_j(instr_sequence *seq, location loc,
     if (_PyInstructionSequence_Addop(seq, opcode, target.id, loc) != SUCCESS) {
         return ERROR;
     }
-    switch (opcode) {
-        case POP_JUMP_IF_FALSE:
-        case POP_JUMP_IF_TRUE:
-        case POP_JUMP_IF_NONE:
-        case POP_JUMP_IF_NOT_NONE:
-        case FOR_ITER:
-            return _PyInstructionSequence_Addop(seq, NOT_TAKEN, 0, NO_LOCATION);
+    if (IS_CONDITIONAL_JUMP_OPCODE(opcode) || opcode == FOR_ITER) {
+        return _PyInstructionSequence_Addop(seq, NOT_TAKEN, 0, NO_LOCATION);
     }
     return SUCCESS;
 }