Move static_arg_parsers into _PyRuntimeState.

ericsnowcurrently · ericsnowcurrently · commit 3d803e9ef694 · 2022-11-14T15:59:18.000-07:00
diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
@@ -26,6 +26,7 @@ extern "C" {
 #include "pycore_unicodeobject.h" // struct _Py_unicode_state
 #include "pycore_warnings.h"      // struct _warnings_runtime_state
 
+
 struct _pending_calls {
     PyThread_type_lock lock;
     /* Request for running pending calls. */
diff --git a/Include/internal/pycore_runtime.h b/Include/internal/pycore_runtime.h
@@ -19,7 +19,8 @@ extern "C" {
 #include "pycore_unicodeobject.h"   // struct _Py_unicode_runtime_ids
 
 struct _getargs_runtime_state {
-   PyThread_type_lock mutex;
+    PyThread_type_lock mutex;
+    struct _PyArg_Parser *static_parsers;
 };
 
 /* ceval state */
diff --git a/Python/getargs.c b/Python/getargs.c
@@ -1846,9 +1846,6 @@ vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
 }
 
 
-/* List of static parsers. */
-static struct _PyArg_Parser *static_arg_parsers = NULL;
-
 static int
 scan_keywords(const char * const *keywords, int *ptotal, int *pposonly)
 {
@@ -2024,8 +2021,8 @@ _parser_init(struct _PyArg_Parser *parser)
     parser->initialized = owned ? 1 : -1;
 
     assert(parser->next == NULL);
-    parser->next = static_arg_parsers;
-    static_arg_parsers = parser;
+    parser->next = _PyRuntime.getargs.static_parsers;
+    _PyRuntime.getargs.static_parsers = parser;
     return 1;
 }
 
@@ -2930,14 +2927,14 @@ _PyArg_NoKwnames(const char *funcname, PyObject *kwnames)
 void
 _PyArg_Fini(void)
 {
-    struct _PyArg_Parser *tmp, *s = static_arg_parsers;
+    struct _PyArg_Parser *tmp, *s = _PyRuntime.getargs.static_parsers;
     while (s) {
         tmp = s->next;
         s->next = NULL;
         parser_clear(s);
         s = tmp;
     }
-    static_arg_parsers = NULL;
+    _PyRuntime.getargs.static_parsers = NULL;
 }
 
 #ifdef __cplusplus
diff --git a/Tools/c-analyzer/cpython/globals-to-fix.tsv b/Tools/c-analyzer/cpython/globals-to-fix.tsv
@@ -327,9 +327,6 @@ Objects/unicodeobject.c	-	ucnhash_capi	-
 # local buffer
 Python/suggestions.c	levenshtein_distance	buffer	-
 
-# linked list
-Python/getargs.c	-	static_arg_parsers	-
-
 # other
 Objects/dictobject.c	-	_pydict_global_version	-
 Objects/dictobject.c	-	next_dict_keys_version	-

Original file line number	Diff line number	Diff line change
`@@ -1846,9 +1846,6 @@ vgetargskeywords(PyObject args, PyObject kwargs, const char *format,`
`1846`	`1846`	`}`
`1847`	`1847`
`1848`	`1848`
`1849`		`-/* List of static parsers. */`
`1850`		`-static struct _PyArg_Parser *static_arg_parsers = NULL;`
`1851`		`-`
`1852`	`1849`	`static int`
`1853`	`1850`	`scan_keywords(const char * const keywords, int ptotal, int *pposonly)`
`1854`	`1851`	`{`
`@@ -2024,8 +2021,8 @@ _parser_init(struct _PyArg_Parser *parser)`
`2024`	`2021`	`parser->initialized = owned ? 1 : -1;`
`2025`	`2022`
`2026`	`2023`	`assert(parser->next == NULL);`
`2027`		`- parser->next = static_arg_parsers;`
`2028`		`- static_arg_parsers = parser;`
	`2024`	`+ parser->next = _PyRuntime.getargs.static_parsers;`
	`2025`	`+ _PyRuntime.getargs.static_parsers = parser;`
`2029`	`2026`	`return 1;`
`2030`	`2027`	`}`
`2031`	`2028`
`@@ -2930,14 +2927,14 @@ _PyArg_NoKwnames(const char funcname, PyObject kwnames)`
`2930`	`2927`	`void`
`2931`	`2928`	`_PyArg_Fini(void)`
`2932`	`2929`	`{`
`2933`		`- struct _PyArg_Parser tmp, s = static_arg_parsers;`
	`2930`	`+ struct _PyArg_Parser tmp, s = _PyRuntime.getargs.static_parsers;`
`2934`	`2931`	`while (s) {`
`2935`	`2932`	`tmp = s->next;`
`2936`	`2933`	`s->next = NULL;`
`2937`	`2934`	`parser_clear(s);`
`2938`	`2935`	`s = tmp;`
`2939`	`2936`	`}`
`2940`		`- static_arg_parsers = NULL;`
	`2937`	`+ _PyRuntime.getargs.static_parsers = NULL;`
`2941`	`2938`	`}`
`2942`	`2939`
`2943`	`2940`	`#ifdef __cplusplus`