gh-120726: Fix compiler warnings on is_core_module() (#120727)

Eclips4 · web-flow · commit a816cd67f43d · 2024-06-19T07:46:04.000Z
Fix compiler warnings on is_core_module() and
check_interpreter_whence(): only define them when
assertions are built.
diff --git a/Python/import.c b/Python/import.c
@@ -1551,6 +1551,7 @@ get_core_module_dict(PyInterpreterState *interp,
     return NULL;
 }
 
+#ifndef NDEBUG
 static inline int
 is_core_module(PyInterpreterState *interp, PyObject *name, PyObject *path)
 {
@@ -1568,7 +1569,6 @@ is_core_module(PyInterpreterState *interp, PyObject *name, PyObject *path)
 }
 
 
-#ifndef NDEBUG
 static _Py_ext_module_kind
 _get_extension_kind(PyModuleDef *def, bool check_size)
 {
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -584,9 +584,9 @@ free_interpreter(PyInterpreterState *interp)
         PyMem_RawFree(interp);
     }
 }
-
+#ifndef NDEBUG
 static inline int check_interpreter_whence(long);
-
+#endif
 /* Get the interpreter state to a minimal consistent state.
    Further init happens in pylifecycle.c before it can be used.
    All fields not initialized here are expected to be zeroed out,
@@ -1130,7 +1130,7 @@ _PyInterpreterState_IsReady(PyInterpreterState *interp)
     return interp->_ready;
 }
 
-
+#ifndef NDEBUG
 static inline int
 check_interpreter_whence(long whence)
 {
@@ -1142,6 +1142,7 @@ check_interpreter_whence(long whence)
     }
     return 0;
 }
+#endif
 
 long
 _PyInterpreterState_GetWhence(PyInterpreterState *interp)

Original file line number	Diff line number	Diff line change
`@@ -1551,6 +1551,7 @@ get_core_module_dict(PyInterpreterState *interp,`
`1551`	`1551`	`return NULL;`
`1552`	`1552`	`}`
`1553`	`1553`
	`1554`	`+#ifndef NDEBUG`
`1554`	`1555`	`static inline int`
`1555`	`1556`	`is_core_module(PyInterpreterState interp, PyObject name, PyObject *path)`
`1556`	`1557`	`{`
`@@ -1568,7 +1569,6 @@ is_core_module(PyInterpreterState interp, PyObject name, PyObject *path)`
`1568`	`1569`	`}`
`1569`	`1570`
`1570`	`1571`
`1571`		`-#ifndef NDEBUG`
`1572`	`1572`	`static _Py_ext_module_kind`
`1573`	`1573`	`_get_extension_kind(PyModuleDef *def, bool check_size)`
`1574`	`1574`	`{`
Original file line number	Diff line number	Diff line change
`@@ -584,9 +584,9 @@ free_interpreter(PyInterpreterState *interp)`
`584`	`584`	`PyMem_RawFree(interp);`
`585`	`585`	`}`
`586`	`586`	`}`
`587`		`-`
	`587`	`+#ifndef NDEBUG`
`588`	`588`	`static inline int check_interpreter_whence(long);`
`589`		`-`
	`589`	`+#endif`
`590`	`590`	`/* Get the interpreter state to a minimal consistent state.`
`591`	`591`	`Further init happens in pylifecycle.c before it can be used.`
`592`	`592`	`All fields not initialized here are expected to be zeroed out,`
`@@ -1130,7 +1130,7 @@ _PyInterpreterState_IsReady(PyInterpreterState *interp)`
`1130`	`1130`	`return interp->_ready;`
`1131`	`1131`	`}`
`1132`	`1132`
`1133`		`-`
	`1133`	`+#ifndef NDEBUG`
`1134`	`1134`	`static inline int`
`1135`	`1135`	`check_interpreter_whence(long whence)`
`1136`	`1136`	`{`
`@@ -1142,6 +1142,7 @@ check_interpreter_whence(long whence)`
`1142`	`1142`	`}`
`1143`	`1143`	`return 0;`
`1144`	`1144`	`}`
	`1145`	`+#endif`
`1145`	`1146`
`1146`	`1147`	`long`
`1147`	`1148`	`_PyInterpreterState_GetWhence(PyInterpreterState *interp)`