Skip to content

bpo-27145:small_ints[x] could be returned in long_add and long_sub #15716

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.

Sign up for GitHub

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 8 commits into from
Nov 26, 2019
Merged

bpo-27145:small_ints[x] could be returned in long_add and long_sub #15716

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1c86737
small_ints[x] could be returned in long_add and long_sub
hongweipeng Sep 6, 2019
166ae36
add test
hongweipeng Sep 6, 2019
69b2e62
code review
hongweipeng Sep 6, 2019
b42130d
handler small int in x_sub
hongweipeng Sep 8, 2019
3a937bc
review and rewrite test
hongweipeng Sep 10, 2019
213cdd9
code review
hongweipeng Sep 10, 2019
9739bc9
revert
hongweipeng Sep 10, 2019
02c5eb2
C code requires braces
hongweipeng Sep 25, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Lib/test/test_long.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,14 @@ def test_huge_rshift_of_huge(self, size):
self.assertEqual(huge >> (sys.maxsize + 1), (1 << 499) + 5)
self.assertEqual(huge >> (sys.maxsize + 1000), 0)

@support.cpython_only
def test_small_ints_in_huge_calculation(self):
a = 2 ** 100
b = -a + 1
c = a + 1
self.assertIs(a + b, 1)
self.assertIs(c - a, 1)

def test_small_ints(self):
for i in range(-5, 257):
self.assertIs(i, i + 0)
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2019-09-06-16-40-12.bpo-27145.njuCXU.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
int + int and int - int operators can now return small integer singletons. Patch by hongweipeng.
15 changes: 9 additions & 6 deletions Objects/longobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3220,6 +3220,8 @@ x_sub(PyLongObject *a, PyLongObject *b)
;
if (i < 0)
return (PyLongObject *)PyLong_FromLong(0);
if (i == 0)
return (PyLongObject *)PyLong_FromLong((sdigit)a->ob_digit[0] - (sdigit)b->ob_digit[0]);
if (a->ob_digit[i] < b->ob_digit[i]) {
sign = -1;
{ PyLongObject *temp = a; a = b; b = temp; }
Expand Down Expand Up @@ -3247,7 +3249,7 @@ x_sub(PyLongObject *a, PyLongObject *b)
if (sign < 0) {
Py_SIZE(z) = -Py_SIZE(z);
}
return long_normalize(z);
return maybe_small_long(long_normalize(z));
}

static PyObject *
Expand Down Expand Up @@ -3296,12 +3298,13 @@ long_sub(PyLongObject *a, PyLongObject *b)
}
if (Py_SIZE(a) < 0) {
if (Py_SIZE(b) < 0)
z = x_sub(a, b);
else
z = x_sub(b, a);
else {
z = x_add(a, b);
if (z != NULL) {
assert(Py_SIZE(z) == 0 || Py_REFCNT(z) == 1);
Py_SIZE(z) = -(Py_SIZE(z));
if (z != NULL) {
assert(Py_SIZE(z) == 0 || Py_REFCNT(z) == 1);
Py_SIZE(z) = -(Py_SIZE(z));
}
}
}
else {
Expand Down