add comment and use Py_ssize_t

python · markshannon · Jun 21, 2022 · Apr 17, 2022 · Apr 17, 2022 · Apr 18, 2022
commit 2d6ee26f9528c459e1a228a337c7be45f44f8775
diff --git a/Include/internal/pycore_long.h b/Include/internal/pycore_long.h
@@ -47,7 +47,7 @@ PyObject *_PyLong_Add(PyLongObject *left, PyLongObject *right);
 PyObject *_PyLong_Multiply(PyLongObject *left, PyLongObject *right);
 PyObject *_PyLong_Subtract(PyLongObject *left, PyLongObject *right);
 
-int _PyLong_AssignValue(PyObject **target, long value);
+int _PyLong_AssignValue(PyObject **target, Py_ssize_t value);
 
 /* Used by Python/mystrtoul.c, _PyBytes_FromHex(),
    _PyBytes_DecodeEscape(), etc. */

diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -263,26 +263,26 @@ _PyLong_FromSTwoDigits(stwodigits x)
 }
 
 int
-_PyLong_AssignValue(PyObject **target, long value)
+_PyLong_AssignValue(PyObject **target, Py_ssize_t value)
 {
     PyObject *old = *target;
     if (IS_SMALL_INT(value)) {
-        *target = get_small_int(Py_SAFE_DOWNCAST(value, long, sdigit));
+        *target = get_small_int(Py_SAFE_DOWNCAST(value, Py_ssize_t, sdigit));
         Py_XDECREF(old);
         return 0;
     }
     else if (old != NULL && PyLong_CheckExact(old) &&
              Py_REFCNT(old) == 1 && Py_SIZE(old) == 1 &&
-             (unsigned long)value <= PyLong_MASK)
+             (size_t)value <= PyLong_MASK)
     {
         // Mutate in place if there are no other references to the old object.
         // This avoids an allocation in a common case.
         ((PyLongObject *)old)->ob_digit[0]
-            = Py_SAFE_DOWNCAST(value, long, digit);
+            = Py_SAFE_DOWNCAST(value, Py_ssize_t, digit);
         return 0;
     }
     else {
-        *target = PyLong_FromLong(value);
+        *target = PyLong_FromSsize_t(value);
         Py_XDECREF(old);
         if (*target == NULL) {
             return -1;

@@ -4510,6 +4510,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             if (_PyLong_AssignValue(&GETLOCAL(_Py_OPARG(next)), value) < 0) {
                 goto error;
             }
+            // The STORE_FAST is already done.
             JUMPBY(INLINE_CACHE_ENTRIES_FOR_ITER + 1);
             NOTRACE_DISPATCH();
         }