gh-94841: Ensure arena_map_get() is inlined in PyObject_Free() (GH-94842)

miss-islington · neonene · web-flow · commit 498c6490807e · 2022-07-14T12:04:06.000-07:00
(cherry picked from commit 9b3f779) Co-authored-by: neonene <53406459+neonene@users.noreply.github.com>
diff --git a/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst b/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
@@ -0,0 +1 @@
+Fix the possible performance regression of :c:func:`PyObject_Free` compiled with MSVC version 1932.
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
@@ -1445,7 +1445,7 @@ static arena_map_bot_t arena_map_root;
 
 /* Return a pointer to a bottom tree node, return NULL if it doesn't exist or
  * it cannot be created */
-static arena_map_bot_t *
+static Py_ALWAYS_INLINE arena_map_bot_t *
 arena_map_get(block *p, int create)
 {
 #ifdef USE_INTERIOR_NODES

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix the possible performance regression of :c:func:`PyObject_Free` compiled with MSVC version 1932.
Original file line number	Diff line number	Diff line change
`@@ -1445,7 +1445,7 @@ static arena_map_bot_t arena_map_root;`
`1445`	`1445`
`1446`	`1446`	`/* Return a pointer to a bottom tree node, return NULL if it doesn't exist or`
`1447`	`1447`	`* it cannot be created */`
`1448`		`-static arena_map_bot_t *`
	`1448`	`+static Py_ALWAYS_INLINE arena_map_bot_t *`
`1449`	`1449`	`arena_map_get(block *p, int create)`
`1450`	`1450`	`{`
`1451`	`1451`	`#ifdef USE_INTERIOR_NODES`