Address review comments

Author: markshannon

Python/optimizer.c

@@ -24,7 +24,8 @@
 #define MAX_EXECUTORS_SIZE 256
 
 #ifdef Py_DEBUG
-static int base_opcode(PyCodeObject *code, int offset)
+static int
+base_opcode(PyCodeObject *code, int offset)
 {
     int opcode = _Py_GetBaseOpcode(code, offset);
     if (opcode == ENTER_EXECUTOR) {
@@ -788,11 +789,13 @@ translate_bytecode_to_trace(
                                 uop = _PyUOp_Replacements[uop];
                                 assert(uop != 0);
 #ifdef Py_DEBUG
-                                uint32_t next_inst = target + 1 + INLINE_CACHE_ENTRIES_FOR_ITER + (oparg > 255);
-                                uint32_t jump_target = next_inst + oparg;
-                                assert(base_opcode(code, jump_target) == END_FOR ||
-                                       base_opcode(code, jump_target) == INSTRUMENTED_END_FOR);
-                                assert(base_opcode(code, jump_target+1) == POP_TOP);
+                                {
+                                    uint32_t next_inst = target + 1 + INLINE_CACHE_ENTRIES_FOR_ITER + (oparg > 255);
+                                    uint32_t jump_target = next_inst + oparg;
+                                    assert(base_opcode(code, jump_target) == END_FOR ||
+                                        base_opcode(code, jump_target) == INSTRUMENTED_END_FOR);
+                                    assert(base_opcode(code, jump_target+1) == POP_TOP);
+                                }
 #endif
                                 break;
                             default:

Python/optimizer_symbols.c

@@ -178,8 +178,12 @@ _Py_uop_sym_set_null(_Py_UopsSymbol *sym)
 bool
 _Py_uop_sym_set_non_null(_Py_UopsSymbol *sym)
 {
+    if (_Py_uop_sym_is_null(sym)) {
+        sym_set_bottom(sym);
+        return false;
+    }
     sym_set_flag(sym, NOT_NULL);
-    return !_Py_uop_sym_is_bottom(sym);
+    return true;
 }