fix up stats and deopt

python · Fidget-Spinner · Jun 17, 2022 · Jun 16, 2022 · Jun 16, 2022 · Jun 16, 2022
commit 626bfa147bec5b76d4f6d291b4194e6c506b72ae
@@ -3651,6 +3651,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 
         TARGET(LOAD_ATTR_PROPERTY) {
             assert(cframe.use_tracing == 0);
+            DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
             _PyLoadMethodCache *cache = (_PyLoadMethodCache *)next_instr;
 
             PyObject *owner = TOP();

diff --git a/Python/specialize.c b/Python/specialize.c
@@ -706,10 +706,14 @@ _Py_Specialize_LoadAttr(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name)
             _PyLoadMethodCache *lm_cache = (_PyLoadMethodCache *)(instr + 1);
             assert(Py_TYPE(descr) == &PyProperty_Type);
             PyObject *fget = ((_PyPropertyObject *)descr)->prop_get;
-            if (fget == NULL || Py_TYPE(fget) != &PyFunction_Type) {
+            if (fget == NULL) {
                 SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_EXPECTED_ERROR);
                 goto fail;
             }
+            if (Py_TYPE(fget) != &PyFunction_Type) {
+                SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_PROPERTY);
+                goto fail;
+            }
             PyFunctionObject *func = (PyFunctionObject *)fget;
             PyCodeObject *fcode = (PyCodeObject *)func->func_code;
             int kind = function_kind(fcode);