+ restore _Py_ADJUST_ERANGE2

Author: skirpichev

Include/internal/pycore_pymath.h

@@ -10,8 +10,10 @@ extern "C" {
 
 
 /* _Py_ADJUST_ERANGE1(x)
- * Set errno to 0 before calling a libm function, and invoke macro after.
- * This makes two kinds of
+ * _Py_ADJUST_ERANGE2(x, y)
+ * Set errno to 0 before calling a libm function, and invoke one of these
+ * macros after, passing the function result(s) (_Py_ADJUST_ERANGE2 is useful
+ * for functions returning complex results).  This makes two kinds of
  * adjustments to errno:  (A) If it looks like the platform libm set
  * errno=ERANGE due to underflow, clear errno. (B) If it looks like the
  * platform libm overflowed but didn't set errno, force errno to ERANGE.  In
@@ -40,6 +42,20 @@ static inline void _Py_ADJUST_ERANGE1(double x)
     }
 }
 
+static inline void _Py_ADJUST_ERANGE2(double x, double y)
+{
+    if (x == INFINITY || x == -INFINITY ||
+        y == INFINITY || y == -INFINITY)
+    {
+        if (errno == 0) {
+            errno = ERANGE;
+        }
+    }
+    else if (errno == ERANGE) {
+        errno = 0;
+    }
+}
+
 
 //--- HAVE_PY_SET_53BIT_PRECISION macro ------------------------------------
 //

Objects/complexobject.c

@@ -11,6 +11,7 @@
 #include "pycore_freelist.h"      // _Py_FREELIST_FREE(), _Py_FREELIST_POP()
 #include "pycore_long.h"          // _PyLong_GetZero()
 #include "pycore_object.h"        // _PyObject_Init()
+#include "pycore_pymath.h"        // _Py_ADJUST_ERANGE2()
 
 
 #define _PyComplexObject_CAST(op)   ((PyComplexObject *)(op))
@@ -325,7 +326,7 @@ _Py_c_pow(Py_complex a, Py_complex b)
         r.imag = len*sin(phase);
 
         if (_Py_c_isinf(r) && _Py_c_isfinite(a) && _Py_c_isfinite(b)) {
-            errno = ERANGE;
+            _Py_ADJUST_ERANGE2(r.real, r.imag);
         }
     }
     return r;
@@ -747,7 +748,7 @@ complex_pow(PyObject *v, PyObject *w, PyObject *z)
     if (b.imag == 0.0 && b.real == floor(b.real) && fabs(b.real) <= 100.0) {
         p = c_powi(a, (long)b.real);
         if (_Py_c_isinf(p) && _Py_c_isfinite(a) && isfinite(b.real)) {
-            errno = ERANGE;
+            _Py_ADJUST_ERANGE2(p.real, p.imag);
         }
     }
     else {