Skip to content
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

gh-100239: Handle NaN and zero division in guards #128963

Merged
merged 8 commits into from
Jan 19, 2025
Merged

gh-100239: Handle NaN and zero division in guards #128963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8547393
Fix zero division
Eclips4 Jan 17, 2025
131b92a
Reorder calls
Eclips4 Jan 17, 2025
8363e9d
Address Irit's review && Add guards for NaN
Eclips4 Jan 17, 2025
850a862
Update Python/specialize.c
Eclips4 Jan 18, 2025
f98667c
Apply the same technique for compactlong_float
Eclips4 Jan 18, 2025
27cd99a
I guess it should work
Eclips4 Jan 18, 2025
aa416bb
Apply suggestions from code review
Eclips4 Jan 19, 2025
127cb30
Address Irit's review
Eclips4 Jan 19, 2025
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
13 changes: 13 additions & 0 deletions Lib/test/test_opcache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1362,6 +1362,19 @@ def binary_op_add_extend():
self.assert_specialized(binary_op_add_extend, "BINARY_OP_EXTEND")
self.assert_no_opcode(binary_op_add_extend, "BINARY_OP")

def compactlong_lhs(arg):
42 / arg
def float_lhs(arg):
42.0 / arg

with self.assertRaises(ZeroDivisionError):
compactlong_lhs(0)
with self.assertRaises(ZeroDivisionError):
compactlong_lhs(0.0)
with self.assertRaises(ZeroDivisionError):
float_lhs(0)
with self.assertRaises(ZeroDivisionError):
float_lhs(0.0)
Eclips4 marked this conversation as resolved.
Show resolved Hide resolved

@cpython_only
@requires_specialization_ft
Expand Down
28 changes: 26 additions & 2 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2426,6 +2426,18 @@ float_compactlong_guard(PyObject *lhs, PyObject *rhs)
);
}

static int
float_compactlong_guard_true_div(PyObject *lhs, PyObject *rhs)
Eclips4 marked this conversation as resolved.
Show resolved Hide resolved
{
// guards should check if rhs has a non-zero value
return (
PyFloat_CheckExact(lhs) &&
PyLong_CheckExact(rhs) &&
_PyLong_IsCompact((PyLongObject *)rhs) &&
!PyLong_IsZero(rhs)
);
}

#define FLOAT_LONG_ACTION(NAME, OP) \
static PyObject * \
(NAME)(PyObject *lhs, PyObject *rhs) \
Expand All @@ -2452,6 +2464,18 @@ compactlong_float_guard(PyObject *lhs, PyObject *rhs)
);
}

static int
compactlong_float_guard_true_div(PyObject *lhs, PyObject *rhs)
{
// guards should check if rhs has a non-zero value
return (
PyFloat_CheckExact(rhs) &&
PyLong_CheckExact(lhs) &&
_PyLong_IsCompact((PyLongObject *)lhs) &&
PyFloat_AsDouble(rhs) != 0.0
);
}

#define LONG_FLOAT_ACTION(NAME, OP) \
static PyObject * \
(NAME)(PyObject *lhs, PyObject *rhs) \
Expand All @@ -2469,14 +2493,14 @@ LONG_FLOAT_ACTION(compactlong_float_true_div, /)
static _PyBinaryOpSpecializationDescr float_compactlong_specs[NB_OPARG_LAST+1] = {
[NB_ADD] = {float_compactlong_guard, float_compactlong_add},
[NB_SUBTRACT] = {float_compactlong_guard, float_compactlong_subtract},
[NB_TRUE_DIVIDE] = {float_compactlong_guard, float_compactlong_true_div},
[NB_TRUE_DIVIDE] = {float_compactlong_guard_true_div, float_compactlong_true_div},
[NB_MULTIPLY] = {float_compactlong_guard, float_compactlong_multiply},
};

static _PyBinaryOpSpecializationDescr compactlong_float_specs[NB_OPARG_LAST+1] = {
[NB_ADD] = {compactlong_float_guard, compactlong_float_add},
[NB_SUBTRACT] = {compactlong_float_guard, compactlong_float_subtract},
[NB_TRUE_DIVIDE] = {compactlong_float_guard, compactlong_float_true_div},
[NB_TRUE_DIVIDE] = {compactlong_float_guard_true_div, compactlong_float_true_div},
[NB_MULTIPLY] = {compactlong_float_guard, compactlong_float_multiply},
};

Expand Down
Loading