Rename function

Author: markshannon

Include/internal/pycore_stackref.h

@@ -233,7 +233,8 @@ extern intptr_t PyStackRef_UntagInt(_PyStackRef ref);
 
 extern _PyStackRef PyStackRef_TagInt(intptr_t i);
 
-extern _PyStackRef PyStackRef_IncrementTaggedInt(_PyStackRef ref);
+/* Increments a tagged int, but does not check for overflow */
+extern _PyStackRef PyStackRef_IncrementTaggedIntNoOverflow(_PyStackRef ref);
 
 extern bool
 PyStackRef_IsNullOrInt(_PyStackRef ref);
@@ -265,9 +266,9 @@ PyStackRef_UntagInt(_PyStackRef i)
 
 
 static inline _PyStackRef
-PyStackRef_IncrementTaggedInt(_PyStackRef ref)
+PyStackRef_IncrementTaggedIntNoOverflow(_PyStackRef ref)
 {
-    assert(ref.bits != (uintptr_t)-1); // Overflow
+    assert(ref.bits != (uintptr_t)-1); // Deosn't overflow
     return (_PyStackRef){ .bits = ref.bits + 4 };
 }
 

Python/bytecodes.c

@@ -3112,7 +3112,7 @@ dummy_func(
                     JUMPBY(oparg + 1);
                     DISPATCH();
                 }
-                null_or_index = PyStackRef_IncrementTaggedInt(null_or_index);
+                null_or_index = PyStackRef_IncrementTaggedIntNoOverflow(null_or_index);
             }
             else {
                 PyObject *next_o = (*Py_TYPE(iter_o)->tp_iternext)(iter_o);
@@ -3254,7 +3254,7 @@ dummy_func(
 #else
             next = PyStackRef_FromPyObjectNew(PyList_GET_ITEM(list_o, PyStackRef_UntagInt(null_or_index)));
 #endif
-            null_or_index = PyStackRef_IncrementTaggedInt(null_or_index);
+            null_or_index = PyStackRef_IncrementTaggedIntNoOverflow(null_or_index);
         }
 
         // Only used by Tier 2
@@ -3273,7 +3273,7 @@ dummy_func(
             assert(PyStackRef_UntagInt(null_or_index) < PyList_GET_SIZE(list_o));
             next = PyStackRef_FromPyObjectNew(PyList_GET_ITEM(list_o, PyStackRef_UntagInt(null_or_index)));
 #endif
-            null_or_index = PyStackRef_IncrementTaggedInt(null_or_index);
+            null_or_index = PyStackRef_IncrementTaggedIntNoOverflow(null_or_index);
         }
 
         macro(FOR_ITER_LIST) =
@@ -3317,7 +3317,7 @@ dummy_func(
             uintptr_t i = PyStackRef_UntagInt(null_or_index);
             assert((size_t)i < (size_t)PyTuple_GET_SIZE(tuple_o));
             next = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(tuple_o, i));
-            null_or_index = PyStackRef_IncrementTaggedInt(null_or_index);
+            null_or_index = PyStackRef_IncrementTaggedIntNoOverflow(null_or_index);
         }
 
         macro(FOR_ITER_TUPLE) =

Python/executor_cases.c.h

@@ -217,7 +217,7 @@ PyStackRef_IsNullOrInt(_PyStackRef ref)
 }
 
 _PyStackRef
-PyStackRef_IncrementTaggedInt(_PyStackRef ref)
+PyStackRef_IncrementTaggedIntNoOverflow(_PyStackRef ref)
 {
     assert(ref.index != (uintptr_t)-1); // Overflow
     return (_PyStackRef){ .index = ref.index + 2 };

Python/generated_cases.c.h

@@ -679,7 +679,7 @@ def has_error_without_pop(op: parser.CodeDef) -> bool:
     "PyStackRef_IsTaggedInt",
     "PyStackRef_TagInt",
     "PyStackRef_UntagInt",
-    "PyStackRef_IncrementTaggedInt",
+    "PyStackRef_IncrementTaggedIntNoOverflow",
     "PyStackRef_IsNullOrInt",
 )