Fix last few remaining problems

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(_PyStackRef *input, Py_ssize_t nargs, PyObject **scratch);
+PyAPI_FUNC(PyObject **) _PyObjectArray_FromStackRefArray(_PyStackRef *restrict input, Py_ssize_t nargs, PyObject **restrict scratch);
 
 PyAPI_FUNC(void) _PyObjectArray_Free(PyObject **array, PyObject **scratch);
 
@@ -391,6 +391,9 @@ _PyForIter_VirtualIteratorNext(PyThreadState* tstate, struct _PyInterpreterFrame
 #define SPECIAL___AEXIT__   3
 #define SPECIAL_MAX   3
 
+/* Special counterparts of ceval functions for performance reasons */
+PyAPI_FUNC(int) _PyEval_Mapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **result);
+
 #ifdef __cplusplus
 }
 #endif

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 *keys, Py_ssize_t keys_offset,
-        PyObject *const *values, Py_ssize_t values_offset,
+        PyObject *const *restrict keys, Py_ssize_t keys_offset,
+        PyObject *const *restrict values, Py_ssize_t values_offset,
         Py_ssize_t length);
 
 static inline uint8_t *

Include/internal/pycore_unicodeobject.h

@@ -206,8 +206,8 @@ PyAPI_FUNC(PyObject*) _PyUnicode_TransformDecimalAndSpaceToASCII(
 /* --- Methods & Slots ---------------------------------------------------- */
 
 PyAPI_FUNC(PyObject*) _PyUnicode_JoinArray(
-    PyObject *separator,
-    PyObject *const *items,
+    PyObject *restrict separator,
+    PyObject *const *restrict items,
     Py_ssize_t seqlen
     );
 

Include/pyport.h

@@ -385,19 +385,13 @@ extern "C" {
 #  define Py_NO_INLINE
 #endif
 
-// Any function annotated with this MUST not modify global state.
-// It can only modify state referenced by its parameters.
-// This is useful for optimizations on certain compilers.
-// Please see https://learn.microsoft.com/en-us/cpp/cpp/noalias
-#if defined(__GNUC__) || defined(__clang__) || defined(__INTEL_COMPILER)
-#  define Py_NOALIAS
-#elif defined(_MSC_VER)
-#  define Py_NOALIAS __declspec(noalias)
+#if defined(_MSC_VER) && Py_TAIL_CALL_INTERP
+#  define Py_NO_INLINE_MSVC_TAILCALL Py_NO_INLINE
 #else
-#  define Py_NOALIAS
+#  define Py_NO_INLINE_MSVC_TAILCALL
 #endif
 
-// A no-op at compile time. Hints to the programmer
+// Just a scope. Hints to the programmer
 // That any local variable defined within this block MUST
 // not escape from the current definition.
 # define Py_BEGIN_LOCALS_MUST_NOT_ESCAPE() {

Objects/abstract.c

@@ -224,6 +224,12 @@ PyMapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **result)
     return 0;
 }
 
+Py_NO_INLINE_MSVC_TAILCALL int
+_PyEval_Mapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **restrict result)
+{
+    return PyMapping_GetOptionalItem(obj, key, result);
+}
+
 int
 PyObject_SetItem(PyObject *o, PyObject *key, PyObject *value)
 {

Objects/dictobject.c

@@ -2225,9 +2225,9 @@ _PyDict_NewPresized(Py_ssize_t minused)
     return dict_new_presized(minused, false);
 }
 
-PyObject *
-_PyDict_FromItems(PyObject *const *keys, Py_ssize_t keys_offset,
-                  PyObject *const *values, Py_ssize_t values_offset,
+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,
                   Py_ssize_t length)
 {
     bool unicode = true;

Objects/unicodeobject.c

@@ -10234,7 +10234,7 @@ PyUnicode_Join(PyObject *separator, PyObject *seq)
 }
 
 PyObject *
-_PyUnicode_JoinArray(PyObject *separator, PyObject *const *items, Py_ssize_t seqlen)
+_PyUnicode_JoinArray(PyObject *restrict separator, PyObject *const *restrict items, Py_ssize_t seqlen)
 {
     PyObject *res = NULL; /* the result */
     PyObject *sep = NULL;

Python/bytecodes.c

@@ -1534,8 +1534,8 @@ dummy_func(
         }
 
         inst(LOAD_BUILD_CLASS, ( -- bc)) {
-            PyObject *bc_o;
-            int err = PyMapping_GetOptionalItem(BUILTINS(), &_Py_ID(__build_class__), &bc_o);
+            PyObject *restrict bc_o;
+            int err = _PyEval_Mapping_GetOptionalItem(BUILTINS(), &_Py_ID(__build_class__), &bc_o);
             ERROR_IF(err < 0);
             if (bc_o == NULL) {
                 _PyErr_SetString(tstate, PyExc_NameError,
@@ -1738,8 +1738,8 @@ dummy_func(
 
         inst(LOAD_FROM_DICT_OR_GLOBALS, (mod_or_class_dict -- v)) {
             PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
-            PyObject *v_o;
-            int err = PyMapping_GetOptionalItem(PyStackRef_AsPyObjectBorrow(mod_or_class_dict), name, &v_o);
+            PyObject *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);
             if (v_o == NULL) {
@@ -1762,11 +1762,11 @@ dummy_func(
                 else {
                     /* Slow-path if globals or builtins is not a dict */
                     /* namespace 1: globals */
-                    int err = PyMapping_GetOptionalItem(GLOBALS(), name, &v_o);
+                    int err = _PyEval_Mapping_GetOptionalItem(GLOBALS(), name, &v_o);
                     ERROR_IF(err < 0);
                     if (v_o == NULL) {
                         /* namespace 2: builtins */
-                        int err = PyMapping_GetOptionalItem(BUILTINS(), name, &v_o);
+                        int err = _PyEval_Mapping_GetOptionalItem(BUILTINS(), name, &v_o);
                         ERROR_IF(err < 0);
                         if (v_o == NULL) {
                             _PyEval_FormatExcCheckArg(
@@ -1925,14 +1925,14 @@ dummy_func(
         }
 
         inst(LOAD_FROM_DICT_OR_DEREF, (class_dict_st -- value)) {
-            PyObject *value_o;
+            PyObject *restrict value_o;
             PyObject *name;
             PyObject *class_dict = PyStackRef_AsPyObjectBorrow(class_dict_st);
 
             assert(class_dict);
             assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus);
             name = PyTuple_GET_ITEM(_PyFrame_GetCode(frame)->co_localsplusnames, oparg);
-            int err = PyMapping_GetOptionalItem(class_dict, name, &value_o);
+            int err = _PyEval_Mapping_GetOptionalItem(class_dict, name, &value_o);
             if (err < 0) {
                 ERROR_NO_POP();
             }
@@ -2115,14 +2115,14 @@ dummy_func(
         }
 
         inst(SETUP_ANNOTATIONS, (--)) {
-            PyObject *ann_dict;
+            PyObject *restrict ann_dict;
             if (LOCALS() == NULL) {
                 _PyErr_Format(tstate, PyExc_SystemError,
                               "no locals found when setting up annotations");
                 ERROR_IF(true);
             }
             /* check if __annotations__ in locals()... */
-            int err = PyMapping_GetOptionalItem(LOCALS(), &_Py_ID(__annotations__), &ann_dict);
+            int err = _PyEval_Mapping_GetOptionalItem(LOCALS(), &_Py_ID(__annotations__), &ann_dict);
             ERROR_IF(err < 0);
             if (ann_dict == NULL) {
                 ann_dict = PyDict_New();
@@ -2289,18 +2289,13 @@ dummy_func(
             PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2);
             PyTypeObject *cls = (PyTypeObject *)class;
             int method_found = 0;
-            PyObject *attr_o = _PySuper_Lookup(cls, self, name,
-                                   Py_TYPE(self)->tp_getattro == PyObject_GenericGetAttr ? &method_found : NULL);
+            PyObject *attr_o = _PySuper_Lookup(cls, self, name, NULL);
             if (attr_o == NULL) {
                 ERROR_NO_POP();
             }
-            if (method_found) {
-                self_or_null = self_st; // transfer ownership
-                DEAD(self_st);
-            } else {
-                PyStackRef_CLOSE(self_st);
-                self_or_null = PyStackRef_NULL;
-            }
+             PyStackRef_CLOSE(self_st);
+            self_or_null = PyStackRef_NULL;
+           
             DECREF_INPUTS();
 
             attr = PyStackRef_FromPyObjectSteal(attr_o);