Skip to content

bpo-35696: Remove unnecessary operation in long_compare() #16146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 18, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions Objects/longobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -3028,33 +3028,32 @@ PyLong_AsDouble(PyObject *v)

/* Methods */

static int
/* if a < b, return a negative number
if a == b, return 0
if a > b, return a positive number */

static Py_ssize_t
long_compare(PyLongObject *a, PyLongObject *b)
{
Py_ssize_t sign;

if (Py_SIZE(a) != Py_SIZE(b)) {
sign = Py_SIZE(a) - Py_SIZE(b);
}
else {
Py_ssize_t sign = Py_SIZE(a) - Py_SIZE(b);
if (sign == 0) {
Py_ssize_t i = Py_ABS(Py_SIZE(a));
while (--i >= 0 && a->ob_digit[i] == b->ob_digit[i])
;
if (i < 0)
sign = 0;
else {
sign = (sdigit)a->ob_digit[i] - (sdigit)b->ob_digit[i];
if (Py_SIZE(a) < 0)
sign = -sign;
sdigit diff = 0;
while (--i >= 0) {
diff = (sdigit) a->ob_digit[i] - (sdigit) b->ob_digit[i];
if (diff) {
break;
}
}
sign = Py_SIZE(a) < 0 ? -diff : diff;
}
return sign < 0 ? -1 : sign > 0 ? 1 : 0;
return sign;
}

static PyObject *
long_richcompare(PyObject *self, PyObject *other, int op)
{
int result;
Py_ssize_t result;
CHECK_BINOP(self, other);
if (self == other)
result = 0;
Expand Down Expand Up @@ -5210,7 +5209,8 @@ _PyLong_DivmodNear(PyObject *a, PyObject *b)
{
PyLongObject *quo = NULL, *rem = NULL;
PyObject *twice_rem, *result, *temp;
int cmp, quo_is_odd, quo_is_neg;
int quo_is_odd, quo_is_neg;
Py_ssize_t cmp;

/* Equivalent Python code:

Expand Down