Issue #29282: Backed out changeset b33012ef1417

This commit is contained in:
Mark Dickinson 2017-01-21 13:10:52 +00:00
parent d1b230e48b
commit 5e65cd39df
6 changed files with 1 additions and 338 deletions

View file

@ -1595,47 +1595,6 @@ math_factorial(PyObject *module, PyObject *arg)
}
/*[clinic input]
math.fma
x: double
y: double
z: double
/
Fused multiply-add operation. Compute (x * y) + z with a single round.
[clinic start generated code]*/
static PyObject *
math_fma_impl(PyObject *module, double x, double y, double z)
/*[clinic end generated code: output=4fc8626dbc278d17 input=2ae8bb2a6e0f8b77]*/
{
double r;
r = fma(x, y, z);
/* Fast path: if we got a finite result, we're done. */
if (Py_IS_FINITE(r)) {
return PyFloat_FromDouble(r);
}
/* Non-finite result. Raise an exception if appropriate, else return r. */
if (Py_IS_NAN(r)) {
if (!Py_IS_NAN(x) && !Py_IS_NAN(y) && !Py_IS_NAN(z)) {
/* NaN result from non-NaN inputs. */
PyErr_SetString(PyExc_ValueError, "invalid operation in fma");
return NULL;
}
}
else if (Py_IS_FINITE(x) && Py_IS_FINITE(y) && Py_IS_FINITE(z)) {
/* Infinite result from finite inputs. */
PyErr_SetString(PyExc_OverflowError, "overflow in fma");
return NULL;
}
return PyFloat_FromDouble(r);
}
/*[clinic input]
math.trunc
@ -2265,7 +2224,6 @@ static PyMethodDef math_methods[] = {
{"fabs", math_fabs, METH_O, math_fabs_doc},
MATH_FACTORIAL_METHODDEF
MATH_FLOOR_METHODDEF
MATH_FMA_METHODDEF
MATH_FMOD_METHODDEF
MATH_FREXP_METHODDEF
MATH_FSUM_METHODDEF