Change restricts to MSVC only

python · Fidget-Spinner · Aug 21, 2025 · Aug 21, 2025 · Aug 21, 2025 · Aug 21, 2025
commit 86f19cf7880f62de288d28bf0f7440f07a1aea2a
diff --git a/Include/internal/pycore_dict.h b/Include/internal/pycore_dict.h
@@ -290,8 +290,8 @@ _PyDict_NotifyEvent(PyInterpreterState *interp,
 extern PyDictObject *_PyObject_MaterializeManagedDict(PyObject *obj);
 
 PyAPI_FUNC(PyObject *)_PyDict_FromItems(
-        PyObject *const *restrict keys, Py_ssize_t keys_offset,
-        PyObject *const *restrict values, Py_ssize_t values_offset,
+        PyObject *const *keys, Py_ssize_t keys_offset,
+        PyObject *const *values, Py_ssize_t values_offset,
         Py_ssize_t length);
 
 static inline uint8_t *

diff --git a/Include/internal/pycore_unicodeobject.h b/Include/internal/pycore_unicodeobject.h
@@ -274,8 +274,8 @@ PyAPI_FUNC(PyObject*) _PyUnicode_TransformDecimalAndSpaceToASCII(
 /* --- Methods & Slots ---------------------------------------------------- */
 
 PyAPI_FUNC(PyObject*) _PyUnicode_JoinArray(
-    PyObject *restrict separator,
-    PyObject *const *restrict items,
+    PyObject * separator,
+    PyObject *const * items,
     Py_ssize_t seqlen
     );
 

diff --git a/Include/pyport.h b/Include/pyport.h
@@ -385,7 +385,7 @@ extern "C" {
 #  define Py_NO_INLINE
 #endif
 
-#if defined(_MSC_VER) && !defined(__clang__) && Py_TAIL_CALL_INTERP
+#if defined(_MSC_VER) && !defined(__clang__) && _Py_TAIL_CALL_INTERP
 #  define Py_NO_INLINE_MSVC_TAILCALL Py_NO_INLINE
 #else
 #  define Py_NO_INLINE_MSVC_TAILCALL

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -2226,8 +2226,8 @@ _PyDict_NewPresized(Py_ssize_t minused)
 }
 
 Py_NO_INLINE_MSVC_TAILCALL PyObject *
-_PyDict_FromItems(PyObject *const *restrict keys, Py_ssize_t keys_offset,
-                  PyObject *const *restrict values, Py_ssize_t values_offset,
+_PyDict_FromItems(PyObject *const *Py_MSVC_RESTRICT keys, Py_ssize_t keys_offset,
+                  PyObject *const *Py_MSVC_RESTRICT values, Py_ssize_t values_offset,
                   Py_ssize_t length)
 {
     bool unicode = true;

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -10068,7 +10068,7 @@ PyUnicode_Join(PyObject *separator, PyObject *seq)
 }
 
 PyObject *
-_PyUnicode_JoinArray(PyObject *restrict separator, PyObject *const *restrict items, Py_ssize_t seqlen)
+_PyUnicode_JoinArray(PyObject *Py_MSVC_RESTRICT separator, PyObject *const *Py_MSVC_RESTRICT items, Py_ssize_t seqlen)
 {
     PyObject *res = NULL; /* the result */
     PyObject *sep = NULL;

@@ -78,7 +78,7 @@
 #   define TAIL_CALL_ARGS frame, stack_pointer, tstate, next_instr, instruction_funcptr_table, oparg
 #endif
 
-#if Py_TAIL_CALL_INTERP
+#if _Py_TAIL_CALL_INTERP
 #   if defined(_MSC_VER) && !defined(__clang__)
 #      define Py_MUSTTAIL [[msvc::musttail]]
 #      define Py_PRESERVE_NONE_CC __preserve_none