gh-121266: Remove Py_ALWAYS_INLINE in dictobject.c (#121493)

vstinner · web-flow · commit c5a6b9afd82c · 2024-07-18T08:19:32.000+02:00
compare_unicode_generic(), compare_unicode_unicode() and
compare_generic() are callbacks used by do_lookup(). When enabling
assertions, it's not possible to inline these functions.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -1092,7 +1092,7 @@ do_lookup(PyDictObject *mp, PyDictKeysObject *dk, PyObject *key, Py_hash_t hash,
     Py_UNREACHABLE();
 }
 
-static inline Py_ALWAYS_INLINE int
+static inline int
 compare_unicode_generic(PyDictObject *mp, PyDictKeysObject *dk,
                         void *ep0, Py_ssize_t ix, PyObject *key, Py_hash_t hash)
 {
@@ -1127,7 +1127,7 @@ unicodekeys_lookup_generic(PyDictObject *mp, PyDictKeysObject* dk, PyObject *key
     return do_lookup(mp, dk, key, hash, compare_unicode_generic);
 }
 
-static inline Py_ALWAYS_INLINE int
+static inline int
 compare_unicode_unicode(PyDictObject *mp, PyDictKeysObject *dk,
                         void *ep0, Py_ssize_t ix, PyObject *key, Py_hash_t hash)
 {
@@ -1148,7 +1148,7 @@ unicodekeys_lookup_unicode(PyDictKeysObject* dk, PyObject *key, Py_hash_t hash)
     return do_lookup(NULL, dk, key, hash, compare_unicode_unicode);
 }
 
-static inline Py_ALWAYS_INLINE int
+static inline int
 compare_generic(PyDictObject *mp, PyDictKeysObject *dk,
                 void *ep0, Py_ssize_t ix, PyObject *key, Py_hash_t hash)
 {

Original file line number	Diff line number	Diff line change
`@@ -1092,7 +1092,7 @@ do_lookup(PyDictObject mp, PyDictKeysObject dk, PyObject *key, Py_hash_t hash,`
`1092`	`1092`	`Py_UNREACHABLE();`
`1093`	`1093`	`}`
`1094`	`1094`
`1095`		`-static inline Py_ALWAYS_INLINE int`
	`1095`	`+static inline int`
`1096`	`1096`	`compare_unicode_generic(PyDictObject mp, PyDictKeysObject dk,`
`1097`	`1097`	`void ep0, Py_ssize_t ix, PyObject key, Py_hash_t hash)`
`1098`	`1098`	`{`
`@@ -1127,7 +1127,7 @@ unicodekeys_lookup_generic(PyDictObject mp, PyDictKeysObject dk, PyObject *key`
`1127`	`1127`	`return do_lookup(mp, dk, key, hash, compare_unicode_generic);`
`1128`	`1128`	`}`
`1129`	`1129`
`1130`		`-static inline Py_ALWAYS_INLINE int`
	`1130`	`+static inline int`
`1131`	`1131`	`compare_unicode_unicode(PyDictObject mp, PyDictKeysObject dk,`
`1132`	`1132`	`void ep0, Py_ssize_t ix, PyObject key, Py_hash_t hash)`
`1133`	`1133`	`{`
`@@ -1148,7 +1148,7 @@ unicodekeys_lookup_unicode(PyDictKeysObject* dk, PyObject *key, Py_hash_t hash)`
`1148`	`1148`	`return do_lookup(NULL, dk, key, hash, compare_unicode_unicode);`
`1149`	`1149`	`}`
`1150`	`1150`
`1151`		`-static inline Py_ALWAYS_INLINE int`
	`1151`	`+static inline int`
`1152`	`1152`	`compare_generic(PyDictObject mp, PyDictKeysObject dk,`
`1153`	`1153`	`void ep0, Py_ssize_t ix, PyObject key, Py_hash_t hash)`
`1154`	`1154`	`{`