gh-116029: Fix unused function warning on macOS (#116340)

colesbury · web-flow · commit 58c7919d05a3 · 2024-03-04T22:06:21.000-05:00
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -1238,10 +1238,10 @@ _Py_dict_lookup(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **valu
     return ix;
 }
 
+#ifdef Py_GIL_DISABLED
 static inline void
 ensure_shared_on_read(PyDictObject *mp)
 {
-#ifdef Py_GIL_DISABLED
     if (!_Py_IsOwnedByCurrentThread((PyObject *)mp) && !IS_DICT_SHARED(mp)) {
         // The first time we access a dict from a non-owning thread we mark it
         // as shared. This ensures that a concurrent resize operation will
@@ -1253,8 +1253,8 @@ ensure_shared_on_read(PyDictObject *mp)
         }
         Py_END_CRITICAL_SECTION();
     }
-#endif
 }
+#endif
 
 static inline void
 ensure_shared_on_resize(PyDictObject *mp)

Original file line number	Diff line number	Diff line change
`@@ -1238,10 +1238,10 @@ _Py_dict_lookup(PyDictObject mp, PyObject key, Py_hash_t hash, PyObject **valu`
`1238`	`1238`	`return ix;`
`1239`	`1239`	`}`
`1240`	`1240`
	`1241`	`+#ifdef Py_GIL_DISABLED`
`1241`	`1242`	`static inline void`
`1242`	`1243`	`ensure_shared_on_read(PyDictObject *mp)`
`1243`	`1244`	`{`
`1244`		`-#ifdef Py_GIL_DISABLED`
`1245`	`1245`	`if (!_Py_IsOwnedByCurrentThread((PyObject *)mp) && !IS_DICT_SHARED(mp)) {`
`1246`	`1246`	`// The first time we access a dict from a non-owning thread we mark it`
`1247`	`1247`	`// as shared. This ensures that a concurrent resize operation will`
`@@ -1253,8 +1253,8 @@ ensure_shared_on_read(PyDictObject *mp)`
`1253`	`1253`	`}`
`1254`	`1254`	`Py_END_CRITICAL_SECTION();`
`1255`	`1255`	`}`
`1256`		`-#endif`
`1257`	`1256`	`}`
	`1257`	`+#endif`
`1258`	`1258`
`1259`	`1259`	`static inline void`
`1260`	`1260`	`ensure_shared_on_resize(PyDictObject *mp)`