Address code review

Author: Fidget-Spinner

Lib/test/test_capi/test_opt.py

@@ -3552,7 +3552,7 @@ def testfunc(*args):
         uops = get_opnames(ex)
 
         self.assertIn("_BINARY_OP_SUBSCR_INIT_CALL", uops)
-        # _POP_TOP_NOP is a sign the optimizer ran and didn't hit bottom.
+        # _POP_TOP_NOP is a sign the optimizer ran and didn't hit contradiction.
         self.assertGreaterEqual(count_ops(ex, "_POP_TOP_NOP"), 1)
 
     def test_load_attr_property_frame(self):
@@ -3566,14 +3566,12 @@ def testfunc(*args):
                 y = b.prop + b.prop
 
         testfunc((3, B()))
-        import dis
-        dis.dis(testfunc, adaptive=True)
         res, ex = self._run_with_optimizer(testfunc, (TIER2_THRESHOLD, B()))
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
 
         self.assertIn("_LOAD_ATTR_PROPERTY_FRAME", uops)
-        # This is a sign the optimizer ran and didn't hit bottom.
+        # This is a sign the optimizer ran and didn't hit contradiction.
         self.assertIn("_INSERT_2_LOAD_CONST_INLINE_BORROW", uops)
 
     def test_unary_negative(self):

Python/optimizer_bytecodes.c

@@ -335,6 +335,9 @@ dummy_func(void) {
             break;
         }
         _Py_UOpsAbstractFrame *f = frame_new(ctx, co, 0, NULL, 0);
+        if (f == NULL) {
+            break;
+        }
         f->locals[0] = container;
         f->locals[1] = sub;
         new_frame = PyJitRef_Wrap((JitOptSymbol *)f);
@@ -767,13 +770,17 @@ dummy_func(void) {
     }
 
     op(_LOAD_ATTR_PROPERTY_FRAME, (fget/4, owner -- new_frame)) {
+        // + 1 for _SAVE_RETURN_OFFSET
         assert((this_instr + 2)->opcode == _PUSH_FRAME);
         PyCodeObject *co = get_code_with_logging(this_instr + 2);
         if (co == NULL) {
             ctx->done = true;
             break;
         }
         _Py_UOpsAbstractFrame *f = frame_new(ctx, co, 0, NULL, 0);
+        if (f == NULL) {
+            break;
+        }
         f->locals[0] = owner;
         new_frame = PyJitRef_Wrap((JitOptSymbol *)f);
     }