final fixes

Author: kumaraditya303

Lib/test/test_capi/test_opt.py

@@ -2748,22 +2748,20 @@ def testfunc(n):
         self.assertIn("_CALL_METHOD_DESCRIPTOR_FAST", uops)
         self.assertNotIn("_GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST", uops)
 
-    # this does not work for some reason todo
-    # def test_call_method_descriptor_fast_with_keywords(self):
-    #     def testfunc(n):
-    #         x = 0
-    #         for _ in range(n):
-    #             y = [3, 1, 2]
-    #             y.sort()
-    #             x += y[0]
-    #         return x
-
-    #     res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
-    #     self.assertEqual(res, TIER2_THRESHOLD)
-    #     self.assertIsNotNone(ex)
-    #     uops = get_opnames(ex)
-    #     self.assertIn("_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS", uops)
-    #     self.assertNotIn("_GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS", uops)
+    def test_call_method_descriptor_fast_with_keywords(self):
+        def testfunc(n):
+            x = 0
+            for _ in range(n):
+                y = "hello world"
+                a, b = y.split()
+                x += len(a)
+            return x
+        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+        self.assertEqual(res, TIER2_THRESHOLD * 5)
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+        self.assertIn("_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS", uops)
+        self.assertNotIn("_GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS", uops)
 
     def test_call_intrinsic_1(self):
         def testfunc(n):

Python/optimizer_bytecodes.c

@@ -1307,12 +1307,15 @@ dummy_func(void) {
         PyObject *callable_o = sym_get_const(ctx, callable);
         if (callable_o && sym_matches_type(callable, &PyMethodDescr_Type)) {
             int total_args = oparg;
-            int index = 0;
             if (!sym_is_null(self_or_null)) {
-                index--;
                 total_args++;
             }
-            PyObject *self = sym_get_const(ctx, args[index]);
+            PyObject *self = NULL;
+            if (!sym_is_null(self_or_null)) {
+                self = sym_get_const(ctx, self_or_null);
+            } else {
+                self = sym_get_const(ctx, args[0]);
+            }
             PyTypeObject *d_type = ((PyMethodDescrObject *)callable_o)->d_common.d_type;
             if (total_args != 0 &&
                 ((PyMethodDescrObject *)callable_o)->d_method->ml_flags == (METH_FASTCALL|METH_KEYWORDS) &&