Address review

Author: Fidget-Spinner

Include/internal/pycore_optimizer_types.h

@@ -140,7 +140,6 @@ typedef struct _Py_UOpsAbstractFrame {
     int stack_len;
     int locals_len;
     bool caller; // We have made a call from this frame during the trace
-    bool known_callee;
     PyFunctionObject *func;
     PyCodeObject *code;
 

Lib/test/test_capi/test_opt.py

@@ -630,9 +630,6 @@ def dummy(x):
         self.assertIn("_PUSH_FRAME", uops)
         self.assertIn("_BINARY_OP_ADD_INT", uops)
         self.assertNotIn("_CHECK_PEP_523", uops)
-        # The callee is known, so these should be missing.
-        self.assertNotIn("_GUARD_IP__PUSH_FRAME", uops)
-        self.assertNotIn("_GUARD_CODE_VERSION__PUSH_FRAME", uops)
 
     def test_int_type_propagate_through_range(self):
         def testfunc(n):

Python/optimizer_analysis.c

@@ -390,7 +390,7 @@ optimize_guard_code_version(JitOptContext *ctx, _PyBloomFilter *dependencies,
     if (co->co_version == version) {
         _Py_BloomFilter_Add(dependencies, co);
         // If frame func is known, that means we can get rid of the code guard.
-        if (ctx->frame->caller || ctx->frame->known_callee) {
+        if (ctx->frame->func != NULL && ctx->frame->func->func_version != 0) {
             REPLACE_OP(this_instr, _NOP, 0, 0);
         }
     }

Python/optimizer_bytecodes.c

@@ -904,11 +904,7 @@ dummy_func(void) {
         }
 
         if (sym_is_null(self_or_null) || sym_is_not_null(self_or_null)) {
-            _Py_UOpsAbstractFrame *new_frame_f = frame_new_from_symbol(ctx, callable, args, argcount);
-            new_frame = PyJitRef_WrapInvalid(new_frame_f);
-            if (new_frame_f != NULL) {
-                new_frame_f->known_callee = true;
-            }
+            new_frame = PyJitRef_WrapInvalid(frame_new_from_symbol(ctx, callable, args, argcount));
         } else {
             new_frame = PyJitRef_WrapInvalid(frame_new_from_symbol(ctx, callable, NULL, 0));
         }
@@ -1790,9 +1786,6 @@ dummy_func(void) {
     op(_GUARD_IP__PUSH_FRAME, (ip/4 --)) {
         (void)ip;
         stack_pointer = sym_set_stack_depth((int)this_instr->operand1, stack_pointer);
-        if (ctx->frame->known_callee) {
-            REPLACE_OP(this_instr, _NOP, 0, 0);
-        }
     }
 
     op(_GUARD_IP_YIELD_VALUE, (ip/4 --)) {

Python/optimizer_cases.c.h

@@ -1329,7 +1329,6 @@ _Py_uop_frame_new_from_symbol(
         assert(PyFunction_Check(func));
         frame->func = func;
     }
-    frame->known_callee = false;
     assert(frame->stack_pointer != NULL);
     return frame;
 }