Make the restrict MSVC only for now

Author: Fidget-Spinner

Include/internal/pycore_ceval.h

@@ -303,7 +303,7 @@ PyAPI_FUNC(PyObject *)_PyEval_MatchKeys(PyThreadState *tstate, PyObject *map, Py
 PyAPI_FUNC(void) _PyEval_MonitorRaise(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *instr);
 PyAPI_FUNC(int) _PyEval_UnpackIterableStackRef(PyThreadState *tstate, PyObject *v, int argcnt, int argcntafter, _PyStackRef *sp);
 PyAPI_FUNC(void) _PyEval_FrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *frame);
-PyAPI_FUNC(PyObject **) _PyObjectArray_FromStackRefArray(_PyThreadStateImpl *_tstate, _PyStackRef *restrict input, Py_ssize_t nargs);
+PyAPI_FUNC(PyObject **) _PyObjectArray_FromStackRefArray(_PyThreadStateImpl *_tstate, _PyStackRef *input, Py_ssize_t nargs);
 
 PyAPI_FUNC(void) _PyObjectArray_Free(_PyThreadStateImpl *_tstate, PyObject **array, Py_ssize_t nargs, PyObject **temp_arr);
 

Include/pyport.h

@@ -385,12 +385,18 @@ extern "C" {
 #  define Py_NO_INLINE
 #endif
 
-#if defined(_MSC_VER) && 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
 #endif
 
+#if defined(_MSC_VER) && !defined(__clang__)
+#  define Py_MSVC_RESTRICT restrict
+#else
+#  define Py_MSVC_RESTRICT
+#endif
+
 // Just a scope. Hints to the programmer
 // That any local variable defined within this block MUST
 // not escape from the current definition.

Objects/abstract.c

@@ -225,7 +225,7 @@ PyMapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **result)
 }
 
 Py_NO_INLINE_MSVC_TAILCALL int
-_PyEval_Mapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **restrict result)
+_PyEval_Mapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **Py_MSVC_RESTRICT result)
 {
     return PyMapping_GetOptionalItem(obj, key, result);
 }

Python/bytecodes.c

@@ -1534,7 +1534,7 @@ dummy_func(
         }
 
         inst(LOAD_BUILD_CLASS, ( -- bc)) {
-            PyObject *restrict bc_o;
+            PyObject *Py_MSVC_RESTRICT bc_o;
             int err = _PyEval_Mapping_GetOptionalItem(BUILTINS(), &_Py_ID(__build_class__), &bc_o);
             ERROR_IF(err < 0);
             if (bc_o == NULL) {
@@ -1738,7 +1738,7 @@ dummy_func(
 
         inst(LOAD_FROM_DICT_OR_GLOBALS, (mod_or_class_dict -- v)) {
             PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
-            PyObject *restrict v_o;
+            PyObject *Py_MSVC_RESTRICT v_o;
             int err = _PyEval_Mapping_GetOptionalItem(PyStackRef_AsPyObjectBorrow(mod_or_class_dict), name, &v_o);
             PyStackRef_CLOSE(mod_or_class_dict);
             ERROR_IF(err < 0);
@@ -1925,7 +1925,7 @@ dummy_func(
         }
 
         inst(LOAD_FROM_DICT_OR_DEREF, (class_dict_st -- value)) {
-            PyObject *restrict value_o;
+            PyObject *Py_MSVC_RESTRICT value_o;
             PyObject *name;
             PyObject *class_dict = PyStackRef_AsPyObjectBorrow(class_dict_st);
 
@@ -2115,7 +2115,7 @@ dummy_func(
         }
 
         inst(SETUP_ANNOTATIONS, (--)) {
-            PyObject *restrict ann_dict;
+            PyObject *Py_MSVC_RESTRICT ann_dict;
             if (LOCALS() == NULL) {
                 _PyErr_Format(tstate, PyExc_SystemError,
                               "no locals found when setting up annotations");
@@ -2228,7 +2228,7 @@ dummy_func(
             // handle any case whose performance we care about
             PyObject *super;
             Py_BEGIN_LOCALS_MUST_NOT_ESCAPE();
-                PyObject *restrict stack[] = {class, self};
+                PyObject *Py_MSVC_RESTRICT stack[] = {class, self};
                 super = PyObject_Vectorcall(global_super, stack, oparg & 2, NULL);
             Py_END_LOCALS_MUST_NOT_ESCAPE();
             if (opcode == INSTRUMENTED_LOAD_SUPER_ATTR) {
@@ -2295,7 +2295,7 @@ dummy_func(
             }
              PyStackRef_CLOSE(self_st);
             self_or_null = PyStackRef_NULL;
-           
+
             DECREF_INPUTS();
 
             attr = PyStackRef_FromPyObjectSteal(attr_o);
@@ -3509,7 +3509,7 @@ dummy_func(
             (void)lasti; // Shut up compiler warning if asserts are off
             PyObject* res_o;
             Py_BEGIN_LOCALS_MUST_NOT_ESCAPE();
-            PyObject *restrict stack[5] = {NULL, PyStackRef_AsPyObjectBorrow(exit_self), exc, val_o, tb};
+            PyObject *Py_MSVC_RESTRICT stack[5] = {NULL, PyStackRef_AsPyObjectBorrow(exit_self), exc, val_o, tb};
             int has_self = !PyStackRef_IsNull(exit_self);
             res_o = PyObject_Vectorcall(exit_func_o, stack + 2 - has_self,
                     (3 + has_self) | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);

Python/ceval.c

@@ -945,7 +945,7 @@ extern void _PyUOpPrint(const _PyUOpInstruction *uop);
 
 
 PyObject **
-_PyObjectArray_FromStackRefArray(_PyThreadStateImpl *_tstate, _PyStackRef *input, Py_ssize_t nargs)
+_PyObjectArray_FromStackRefArray(_PyThreadStateImpl *_tstate, _PyStackRef *Py_MSVC_RESTRICT input, Py_ssize_t nargs)
 {
     PyObject **result;
     /* +1 because vectorcall might use -1 to write self */