Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

bpo-37812: Expand CHECK_BINOP to make an (almost) explicit return. #15448

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

Closed
gnprice wants to merge 2 commits into from
Closed

bpo-37812: Expand CHECK_BINOP to make an (almost) explicit return. #15448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e53ea24
bpo-37812: Expand CHECK_BINOP to make an (almost) explicit return.
gnprice Aug 10, 2019
98d16fd
Add NEWS entry.
gnprice Aug 24, 2019
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
3 changes: 3 additions & 0 deletions 3 Misc/NEWS.d/next/Core and Builtins/2019-08-23-22-52-22.bpo-37812.nV83ZY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The ``CHECK_BINOP`` macro inside :file:`Object/longobject.c` has been
replaced with an explicit :c:macro:`Py_RETURN_NOTIMPLEMENTED` at each call
site, inside an ordinary ``if``.

@aeros aeros Aug 24, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the Misc/NEWS entry could be a bit more succinct:

The ``CHECK_BINOP`` macro in :file:`Object/longobject.c` has been replaced by 
using explicit :c:macro:`Py_RETURN_NOTIMPLEMENTED`s.

For more details, readers can look at the changes made to longobject.c.

63 changes: 42 additions & 21 deletions 63 Objects/longobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,13 +1601,6 @@ _PyLong_Size_t_Converter(PyObject *obj, void *ptr)
return 1;
}


#define CHECK_BINOP(v,w) \
do { \
if (!PyLong_Check(v) || !PyLong_Check(w)) \
Py_RETURN_NOTIMPLEMENTED; \
} while(0)

/* x[0:m] and y[0:n] are digit vectors, LSD first, m >= n required. x[0:n]
* is modified in place, by adding y to it. Carries are propagated as far as
* x[m-1], and the remaining carry (0 or 1) is returned.
Expand Down Expand Up @@ -3080,7 +3073,9 @@ static PyObject *
long_richcompare(PyObject *self, PyObject *other, int op)
{
int result;
CHECK_BINOP(self, other);
if (!PyLong_Check(self) || !PyLong_Check(other)) {
Py_RETURN_NOTIMPLEMENTED;
}
if (self == other)
result = 0;
else
Expand Down Expand Up @@ -3241,7 +3236,9 @@ long_add(PyLongObject *a, PyLongObject *b)
{
PyLongObject *z;

CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}

if (Py_ABS(Py_SIZE(a)) <= 1 && Py_ABS(Py_SIZE(b)) <= 1) {
return PyLong_FromLong(MEDIUM_VALUE(a) + MEDIUM_VALUE(b));
Expand Down Expand Up @@ -3275,7 +3272,9 @@ long_sub(PyLongObject *a, PyLongObject *b)
{
PyLongObject *z;

CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}

if (Py_ABS(Py_SIZE(a)) <= 1 && Py_ABS(Py_SIZE(b)) <= 1) {
return PyLong_FromLong(MEDIUM_VALUE(a) - MEDIUM_VALUE(b));
Expand Down Expand Up @@ -3707,7 +3706,9 @@ long_mul(PyLongObject *a, PyLongObject *b)
{
PyLongObject *z;

CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}

/* fast path for single-digit multiplication */
if (Py_ABS(Py_SIZE(a)) <= 1 && Py_ABS(Py_SIZE(b)) <= 1) {
Expand Down Expand Up @@ -3861,7 +3862,9 @@ long_div(PyObject *a, PyObject *b)
{
PyLongObject *div;

CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}

if (Py_ABS(Py_SIZE(a)) == 1 && Py_ABS(Py_SIZE(b)) == 1) {
return fast_floor_div((PyLongObject*)a, (PyLongObject*)b);
Expand All @@ -3886,7 +3889,9 @@ long_true_divide(PyObject *v, PyObject *w)
int inexact, negate, a_is_small, b_is_small;
double dx, result;

CHECK_BINOP(v, w);
if (!PyLong_Check(v) || !PyLong_Check(w)) {
Py_RETURN_NOTIMPLEMENTED;
}
a = (PyLongObject *)v;
b = (PyLongObject *)w;

Expand Down Expand Up @@ -4140,7 +4145,9 @@ long_mod(PyObject *a, PyObject *b)
{
PyLongObject *mod;

CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}

if (Py_ABS(Py_SIZE(a)) == 1 && Py_ABS(Py_SIZE(b)) == 1) {
return fast_mod((PyLongObject*)a, (PyLongObject*)b);
Expand All @@ -4157,7 +4164,9 @@ long_divmod(PyObject *a, PyObject *b)
PyLongObject *div, *mod;
PyObject *z;

CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}

if (l_divmod((PyLongObject*)a, (PyLongObject*)b, &div, &mod) < 0) {
return NULL;
Expand Down Expand Up @@ -4284,7 +4293,9 @@ long_pow(PyObject *v, PyObject *w, PyObject *x)
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};

/* a, b, c = v, w, x */
CHECK_BINOP(v, w);
if (!PyLong_Check(v) || !PyLong_Check(w)) {
Py_RETURN_NOTIMPLEMENTED;
}
a = (PyLongObject*)v; Py_INCREF(a);
b = (PyLongObject*)w; Py_INCREF(b);
if (PyLong_Check(x)) {
Expand Down Expand Up @@ -4593,7 +4604,9 @@ long_rshift(PyObject *a, PyObject *b)
Py_ssize_t wordshift;
digit remshift;

CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}

if (Py_SIZE(b) < 0) {
PyErr_SetString(PyExc_ValueError, "negative shift count");
Expand Down Expand Up @@ -4664,7 +4677,9 @@ long_lshift(PyObject *a, PyObject *b)
Py_ssize_t wordshift;
digit remshift;

CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}

if (Py_SIZE(b) < 0) {
PyErr_SetString(PyExc_ValueError, "negative shift count");
Expand Down Expand Up @@ -4838,7 +4853,9 @@ static PyObject *
long_and(PyObject *a, PyObject *b)
{
PyObject *c;
CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}
c = long_bitwise((PyLongObject*)a, '&', (PyLongObject*)b);
return c;
}
Expand All @@ -4847,7 +4864,9 @@ static PyObject *
long_xor(PyObject *a, PyObject *b)
{
PyObject *c;
CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}
c = long_bitwise((PyLongObject*)a, '^', (PyLongObject*)b);
return c;
}
Expand All @@ -4856,7 +4875,9 @@ static PyObject *
long_or(PyObject *a, PyObject *b)
{
PyObject *c;
CHECK_BINOP(a, b);
if (!PyLong_Check(a) || !PyLong_Check(b)) {
Py_RETURN_NOTIMPLEMENTED;
}
c = long_bitwise((PyLongObject*)a, '|', (PyLongObject*)b);
return c;
}
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.