From: Sam Gross <colesbury@gmail.com>
Date: Fri, 6 Dec 2024 15:48:24 +0000 (+0000)
Subject: gh-125610: Fix `STORE_ATTR_INSTANCE_VALUE` specialization check (GH-125612)
X-Git-Tag: v3.14.0a3~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a353455fca1b8f468ff3ffbb4b5e316510b4fd43;p=thirdparty%2FPython%2Fcpython.git

gh-125610: Fix `STORE_ATTR_INSTANCE_VALUE` specialization check (GH-125612)

The `STORE_ATTR_INSTANCE_VALUE` opcode doesn't support objects with
non-NULL managed dictionaries, so don't specialize to that op in that case.
---

diff --git a/Python/specialize.c b/Python/specialize.c
index ec2cd7025e50..d3fea7172438 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -947,7 +947,10 @@ specialize_dict_access(
         return 0;
     }
     _PyAttrCache *cache = (_PyAttrCache *)(instr + 1);
-    if (type->tp_flags & Py_TPFLAGS_INLINE_VALUES && _PyObject_InlineValues(owner)->valid) {
+    if (type->tp_flags & Py_TPFLAGS_INLINE_VALUES &&
+        _PyObject_InlineValues(owner)->valid &&
+        !(base_op == STORE_ATTR && _PyObject_GetManagedDict(owner) != NULL))
+    {
         PyDictKeysObject *keys = ((PyHeapTypeObject *)type)->ht_cached_keys;
         assert(PyUnicode_CheckExact(name));
         Py_ssize_t index = _PyDictKeys_StringLookup(keys, name);