address review

Author: kumaraditya303

Lib/test/test_capi/test_opt.py

@@ -5013,23 +5013,30 @@ def g():
 
     def test_call_super(self):
         class A:
-            def method(self):
+            def method1(self):
                 return 42
 
+            def method2(self):
+                return 21
+
         class B(A):
-            def method(self):
-                return super().method()
+            def method1(self):
+                return super().method1()
+
+            def method2(self):
+                return super(B, self).method2()
 
         b = B()
 
         def testfunc(n):
             x = 0
             for _ in range(n):
-                x += b.method()
+                x += b.method1()
+                x += b.method2()
             return x
 
         res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
-        self.assertEqual(res, 42 * TIER2_THRESHOLD)
+        self.assertEqual(res, 63 * TIER2_THRESHOLD)
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
         self.assertNotIn("_LOAD_SUPER_ATTR_METHOD", uops)

Python/bytecodes.c

@@ -2639,7 +2639,7 @@ dummy_func(
         op(_GUARD_NOS_TYPE_VERSION, (type_version/2, nos, unused -- nos, unused)) {
             PyTypeObject *tp = (PyTypeObject *)PyStackRef_AsPyObjectBorrow(nos);
             assert(type_version != 0);
-            assert(PyType_Check(tp));
+            EXIT_IF(!PyType_Check((PyObject *)tp));
             EXIT_IF(FT_ATOMIC_LOAD_UINT_RELAXED(tp->tp_version_tag) != type_version);
         }
 

Python/executor_cases.c.h

@@ -433,24 +433,23 @@ lookup_super_attr(JitOptContext *ctx, _PyBloomFilter *dependencies,
         }
         return sym_new_not_null(ctx);
     }
-    if (Py_TYPE(lookup)->tp_flags & Py_TPFLAGS_METHOD_DESCRIPTOR) {
-        int opcode = mortal;
-        if (_Py_IsImmortal(lookup) || (obj_type->tp_flags & Py_TPFLAGS_IMMUTABLETYPE)) {
-            opcode = immortal;
-        }
-        ADD_OP(_SWAP, 3, 0);
-        ADD_OP(_POP_TOP, 0, 0);
-        ADD_OP(_POP_TOP, 0, 0);
-        ADD_OP(opcode, 0, (uintptr_t)lookup);
-        PyType_Watch(TYPE_WATCHER_ID, (PyObject *)su_type);
-        _Py_BloomFilter_Add(dependencies, su_type);
-        PyType_Watch(TYPE_WATCHER_ID, (PyObject *)obj_type);
-        _Py_BloomFilter_Add(dependencies, obj_type);
-        JitOptRef result = sym_new_const(ctx, lookup);
+    if ((Py_TYPE(lookup)->tp_flags & Py_TPFLAGS_METHOD_DESCRIPTOR) == 0) {
         Py_DECREF(lookup);
-        return result;
+        return sym_new_not_null(ctx);
     }
-    return sym_new_not_null(ctx);
+    int opcode = mortal;
+    if (_Py_IsImmortal(lookup) || (obj_type->tp_flags & Py_TPFLAGS_IMMUTABLETYPE)) {
+        opcode = immortal;
+    }
+    ADD_OP(_SWAP, 3, 0);
+    ADD_OP(_POP_TOP, 0, 0);
+    ADD_OP(_POP_TOP, 0, 0);
+    ADD_OP(opcode, 0, (uintptr_t)lookup);
+    PyType_Watch(TYPE_WATCHER_ID, (PyObject *)su_type);
+    _Py_BloomFilter_Add(dependencies, su_type);
+    PyType_Watch(TYPE_WATCHER_ID, (PyObject *)obj_type);
+    _Py_BloomFilter_Add(dependencies, obj_type);
+    return sym_new_const_steal(ctx, lookup);
 }
 
 static