Drop the replace arg to _extensions_cache_set().

ericsnowcurrently · ericsnowcurrently · commit 5167e270b9c6 · 2024-05-01T15:03:42.000-06:00
diff --git a/Python/import.c b/Python/import.c
@@ -1047,8 +1047,7 @@ _extensions_cache_get(PyObject *filename, PyObject *name)
 }
 
 static int
-_extensions_cache_set(PyObject *filename, PyObject *name, PyModuleDef *def,
-                      bool replace)
+_extensions_cache_set(PyObject *filename, PyObject *name, PyModuleDef *def)
 {
     int res = -1;
     assert(def != NULL);
@@ -1077,15 +1076,12 @@ _extensions_cache_set(PyObject *filename, PyObject *name, PyModuleDef *def,
         /* It was previously deleted. */
         entry->value = def;
     }
-    /* We expect it to be static, so it must be the same pointer. */
-    else if ((PyModuleDef *)entry->value == def) {
+    else {
+        /* We expect it to be static, so it must be the same pointer. */
+        assert((PyModuleDef *)entry->value == def);
         /* It was already added. */
         already_set = 1;
     }
-    else {
-        assert(replace);
-        entry->value = def;
-    }
 
     if (!already_set) {
         /* We assume that all module defs are statically allocated
@@ -1345,7 +1341,7 @@ update_global_state_for_extension(PyThreadState *tstate,
         PyModuleDef *cached = _extensions_cache_get(path, name);
         assert(cached == NULL || cached == def);
 #endif
-        if (_extensions_cache_set(path, name, def, false) < 0) {
+        if (_extensions_cache_set(path, name, def) < 0) {
             return -1;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1047,8 +1047,7 @@ _extensions_cache_get(PyObject filename, PyObject name)`
`1047`	`1047`	`}`
`1048`	`1048`
`1049`	`1049`	`static int`
`1050`		`-_extensions_cache_set(PyObject filename, PyObject name, PyModuleDef *def,`
`1051`		`- bool replace)`
	`1050`	`+_extensions_cache_set(PyObject filename, PyObject name, PyModuleDef *def)`
`1052`	`1051`	`{`
`1053`	`1052`	`int res = -1;`
`1054`	`1053`	`assert(def != NULL);`
`@@ -1077,15 +1076,12 @@ _extensions_cache_set(PyObject filename, PyObject name, PyModuleDef *def,`
`1077`	`1076`	`/* It was previously deleted. */`
`1078`	`1077`	`entry->value = def;`
`1079`	`1078`	`}`
`1080`		`- /* We expect it to be static, so it must be the same pointer. */`
`1081`		`- else if ((PyModuleDef *)entry->value == def) {`
	`1079`	`+ else {`
	`1080`	`+ /* We expect it to be static, so it must be the same pointer. */`
	`1081`	`+ assert((PyModuleDef *)entry->value == def);`
`1082`	`1082`	`/* It was already added. */`
`1083`	`1083`	`already_set = 1;`
`1084`	`1084`	`}`
`1085`		`- else {`
`1086`		`- assert(replace);`
`1087`		`- entry->value = def;`
`1088`		`- }`
`1089`	`1085`
`1090`	`1086`	`if (!already_set) {`
`1091`	`1087`	`/* We assume that all module defs are statically allocated`
`@@ -1345,7 +1341,7 @@ update_global_state_for_extension(PyThreadState *tstate,`
`1345`	`1341`	`PyModuleDef *cached = _extensions_cache_get(path, name);`
`1346`	`1342`	`assert(cached == NULL \|\| cached == def);`
`1347`	`1343`	`#endif`
`1348`		`- if (_extensions_cache_set(path, name, def, false) < 0) {`
	`1344`	`+ if (_extensions_cache_set(path, name, def) < 0) {`
`1349`	`1345`	`return -1;`
`1350`	`1346`	`}`
`1351`	`1347`	`}`