pythongh-105035: fix super() calls on unusual types (e.g. meta-types)

carljm · May 30, 2023 · 4ef2316 · 4ef2316
1 parent b7aadb4
commit 4ef2316
Show file tree

Hide file tree

Showing 4 changed files with 238 additions and 219 deletions.
diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py
@@ -410,6 +410,18 @@ def method(self):
 
         self.assertEqual(C().method(), mysuper)
 
+    def test_unusual_getattro(self):
+        class MyType(type):
+            pass
+
+        def test(name):
+            mytype = MyType(name, (MyType,), {})
+            super(MyType, type(mytype)).__setattr__(mytype, "bar", 1)
+            self.assertEqual(mytype.bar, 1)
+
+        test("foo1")
+        test("foo2")
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -1658,6 +1658,7 @@ dummy_func(
             assert(oparg & 1);
             DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
             DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
+            DEOPT_IF(((PyTypeObject *)class)->tp_getattro != PyObject_GenericGetAttr, LOAD_SUPER_ATTR);
             STAT_INC(LOAD_SUPER_ATTR, hit);
             PyObject *name = GETITEM(frame->f_code->co_names, oparg >> 2);
             int method_found = 0;