gh-116417: Fix WASI build of _testlimitedcapi (#116974)

Use different function names between _testcapi and _testlimitedcapi
to not confuse the WASI linker.

diff --git a/Modules/_testlimitedcapi.c b/Modules/_testlimitedcapi.c
index a25b0aa2de7c99395d2798101bf13ee25eac3372..9edc4fe3a9e97047711599cc1b1b30d7c6dffd3b 100644 (file)
--- a/Modules/_testlimitedcapi.c
+++ b/Modules/_testlimitedcapi.c
@@ -26,28 +26,28 @@ PyInit__testlimitedcapi(void)
         return NULL;
     }
 
-    if (_PyTestCapi_Init_ByteArray(mod) < 0) {
+    if (_PyTestLimitedCAPI_Init_ByteArray(mod) < 0) {
         return NULL;
     }
-    if (_PyTestCapi_Init_Bytes(mod) < 0) {
+    if (_PyTestLimitedCAPI_Init_Bytes(mod) < 0) {
         return NULL;
     }
-    if (_PyTestCapi_Init_HeaptypeRelative(mod) < 0) {
+    if (_PyTestLimitedCAPI_Init_HeaptypeRelative(mod) < 0) {
         return NULL;
     }
-    if (_PyTestCapi_Init_List(mod) < 0) {
+    if (_PyTestLimitedCAPI_Init_List(mod) < 0) {
         return NULL;
     }
-    if (_PyTestCapi_Init_PyOS(mod) < 0) {
+    if (_PyTestLimitedCAPI_Init_PyOS(mod) < 0) {
         return NULL;
     }
-    if (_PyTestCapi_Init_Set(mod) < 0) {
+    if (_PyTestLimitedCAPI_Init_Set(mod) < 0) {
         return NULL;
     }
-    if (_PyTestCapi_Init_Sys(mod) < 0) {
+    if (_PyTestLimitedCAPI_Init_Sys(mod) < 0) {
         return NULL;
     }
-    if (_PyTestCapi_Init_VectorcallLimited(mod) < 0) {
+    if (_PyTestLimitedCAPI_Init_VectorcallLimited(mod) < 0) {
         return NULL;
     }
     return mod;

diff --git a/Modules/_testlimitedcapi/bytearray.c b/Modules/_testlimitedcapi/bytearray.c
index dc47ed2c306f40f91b4bf237c2682013b770a4c3..68b029e25af6773823393cbad9e92c030476a3d3 100644 (file)
--- a/Modules/_testlimitedcapi/bytearray.c
+++ b/Modules/_testlimitedcapi/bytearray.c
@@ -113,7 +113,7 @@ static PyMethodDef test_methods[] = {
 };
 
 int
-_PyTestCapi_Init_ByteArray(PyObject *m)
+_PyTestLimitedCAPI_Init_ByteArray(PyObject *m)
 {
     if (PyModule_AddFunctions(m, test_methods) < 0) {
         return -1;

diff --git a/Modules/_testlimitedcapi/bytes.c b/Modules/_testlimitedcapi/bytes.c
index a14c4f9d4d30a8c8a19a81684ab800fed3719c85..157d4089954af50aa9d057f51a308857ba098da5 100644 (file)
--- a/Modules/_testlimitedcapi/bytes.c
+++ b/Modules/_testlimitedcapi/bytes.c
@@ -245,7 +245,7 @@ static PyMethodDef test_methods[] = {
 };
 
 int
-_PyTestCapi_Init_Bytes(PyObject *m)
+_PyTestLimitedCAPI_Init_Bytes(PyObject *m)
 {
     if (PyModule_AddFunctions(m, test_methods) < 0) {
         return -1;

diff --git a/Modules/_testlimitedcapi/heaptype_relative.c b/Modules/_testlimitedcapi/heaptype_relative.c
index d0316dd4fc63b4b4ab9e831639217b2d2bc81350..7c508c6182bc8a8f97ebc3919ae167592883c0e0 100644 (file)
--- a/Modules/_testlimitedcapi/heaptype_relative.c
+++ b/Modules/_testlimitedcapi/heaptype_relative.c
@@ -331,7 +331,8 @@ static PyMethodDef TestMethods[] = {
 };
 
 int
-_PyTestCapi_Init_HeaptypeRelative(PyObject *m) {
+_PyTestLimitedCAPI_Init_HeaptypeRelative(PyObject *m)
+{
     if (PyModule_AddFunctions(m, TestMethods) < 0) {
         return -1;
     }

diff --git a/Modules/_testlimitedcapi/list.c b/Modules/_testlimitedcapi/list.c
index 0917900da390ce63a8d37437fde69b004b31d295..3022cbf9191b2e9cdb8432bfb2b18c5104b4765d 100644 (file)
--- a/Modules/_testlimitedcapi/list.c
+++ b/Modules/_testlimitedcapi/list.c
@@ -159,7 +159,7 @@ static PyMethodDef test_methods[] = {
 };
 
 int
-_PyTestCapi_Init_List(PyObject *m)
+_PyTestLimitedCAPI_Init_List(PyObject *m)
 {
     if (PyModule_AddFunctions(m, test_methods) < 0) {
         return -1;

diff --git a/Modules/_testlimitedcapi/parts.h b/Modules/_testlimitedcapi/parts.h
index bb867eccbfe5c365417a9523c0f97cda368d04db..ee67f10e4b483032776a27f38fbc239fda97e9ec 100644 (file)
--- a/Modules/_testlimitedcapi/parts.h
+++ b/Modules/_testlimitedcapi/parts.h
@@ -22,13 +22,13 @@
 #  error "Py_BUILD_CORE macro must not be defined"
 #endif
 
-int _PyTestCapi_Init_ByteArray(PyObject *module);
-int _PyTestCapi_Init_Bytes(PyObject *module);
-int _PyTestCapi_Init_HeaptypeRelative(PyObject *module);
-int _PyTestCapi_Init_List(PyObject *module);
-int _PyTestCapi_Init_PyOS(PyObject *module);
-int _PyTestCapi_Init_Set(PyObject *module);
-int _PyTestCapi_Init_Sys(PyObject *module);
-int _PyTestCapi_Init_VectorcallLimited(PyObject *module);
+int _PyTestLimitedCAPI_Init_ByteArray(PyObject *module);
+int _PyTestLimitedCAPI_Init_Bytes(PyObject *module);
+int _PyTestLimitedCAPI_Init_HeaptypeRelative(PyObject *module);
+int _PyTestLimitedCAPI_Init_List(PyObject *module);
+int _PyTestLimitedCAPI_Init_PyOS(PyObject *module);
+int _PyTestLimitedCAPI_Init_Set(PyObject *module);
+int _PyTestLimitedCAPI_Init_Sys(PyObject *module);
+int _PyTestLimitedCAPI_Init_VectorcallLimited(PyObject *module);
 
 #endif // Py_TESTLIMITEDCAPI_PARTS_H

diff --git a/Modules/_testlimitedcapi/pyos.c b/Modules/_testlimitedcapi/pyos.c
index 63140e914875db2650b5be9f6f818ca5549abc83..0f61801eae322af77349eb28ffedf7514c74e2d7 100644 (file)
--- a/Modules/_testlimitedcapi/pyos.c
+++ b/Modules/_testlimitedcapi/pyos.c
@@ -50,7 +50,7 @@ static PyMethodDef test_methods[] = {
 };
 
 int
-_PyTestCapi_Init_PyOS(PyObject *mod)
+_PyTestLimitedCAPI_Init_PyOS(PyObject *mod)
 {
     if (PyModule_AddFunctions(mod, test_methods) < 0) {
         return -1;

diff --git a/Modules/_testlimitedcapi/set.c b/Modules/_testlimitedcapi/set.c
index 471b515f874473916928d5408b350c71efa81b2d..35da5fa5f008e1cfca0fb1be5a70676ede3535cd 100644 (file)
--- a/Modules/_testlimitedcapi/set.c
+++ b/Modules/_testlimitedcapi/set.c
@@ -179,7 +179,7 @@ static PyMethodDef test_methods[] = {
 };
 
 int
-_PyTestCapi_Init_Set(PyObject *m)
+_PyTestLimitedCAPI_Init_Set(PyObject *m)
 {
     if (PyModule_AddFunctions(m, test_methods) < 0) {
         return -1;

diff --git a/Modules/_testlimitedcapi/sys.c b/Modules/_testlimitedcapi/sys.c
index aa40e3cd5b9b295ed2242e05f12933bd72faaf51..7d8b7a8569e51598434d4987246c0cfc3b29954d 100644 (file)
--- a/Modules/_testlimitedcapi/sys.c
+++ b/Modules/_testlimitedcapi/sys.c
@@ -46,7 +46,7 @@ static PyMethodDef test_methods[] = {
 };
 
 int
-_PyTestCapi_Init_Sys(PyObject *m)
+_PyTestLimitedCAPI_Init_Sys(PyObject *m)
 {
     if (PyModule_AddFunctions(m, test_methods) < 0) {
         return -1;

diff --git a/Modules/_testlimitedcapi/vectorcall_limited.c b/Modules/_testlimitedcapi/vectorcall_limited.c
index fc1a89c9098e1b34f812a9f4275e68b1bdf51a4f..784126c17fccc1e40012aca1e96227151cbac673 100644 (file)
--- a/Modules/_testlimitedcapi/vectorcall_limited.c
+++ b/Modules/_testlimitedcapi/vectorcall_limited.c
@@ -182,7 +182,8 @@ static PyMethodDef TestMethods[] = {
 };
 
 int
-_PyTestCapi_Init_VectorcallLimited(PyObject *m) {
+_PyTestLimitedCAPI_Init_VectorcallLimited(PyObject *m)
+{
     if (PyModule_AddFunctions(m, TestMethods) < 0) {
         return -1;
     }