From 932502be1b61c0bbff9f73b9c2c614c07d3126ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:11:04 +0200 Subject: [PATCH] [3.13] gh-136006: fix `Py_NAN` expansion on Solaris systems (GH-136575) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On Solaris, `Py_NAN` may expand as a function address instead of a floating-point number. This amends commit 7a3b03509e5e3e72d8c47137579cccb52548a318. (cherry picked from commit d54b1091d43b9d8f0da0ba081565bccca3f138fd) Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> --- Include/pymath.h | 17 ++++++++++++++++- ...25-07-08-22-07-54.gh-issue-136006.XRU5w4.rst | 2 ++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/C API/2025-07-08-22-07-54.gh-issue-136006.XRU5w4.rst diff --git a/Include/pymath.h b/Include/pymath.h index 4c1e3d9984894b..cfae2477d7fce3 100644 --- a/Include/pymath.h +++ b/Include/pymath.h @@ -54,9 +54,24 @@ /* Py_NAN: Value that evaluates to a quiet Not-a-Number (NaN). The sign is * undefined and normally not relevant, but e.g. fixed for float("nan"). + * + * Note: On Solaris, NAN is a function address, hence arithmetic is impossible. + * For that reason, we instead use the built-in call if available or fallback + * to a generic NaN computed from strtod() as a last resort. + * + * See https://github.com/python/cpython/issues/136006 for details. */ #if !defined(Py_NAN) -# define Py_NAN ((double)NAN) +# if defined(__sun) +# if _Py__has_builtin(__builtin_nanf) +# define Py_NAN ((double)__builtin_nanf("")) +# else +# include +# define Py_NAN (strtod("NAN", NULL)) +# endif +# else +# define Py_NAN ((double)NAN) +# endif #endif #endif /* Py_PYMATH_H */ diff --git a/Misc/NEWS.d/next/C API/2025-07-08-22-07-54.gh-issue-136006.XRU5w4.rst b/Misc/NEWS.d/next/C API/2025-07-08-22-07-54.gh-issue-136006.XRU5w4.rst new file mode 100644 index 00000000000000..2165e535b12245 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2025-07-08-22-07-54.gh-issue-136006.XRU5w4.rst @@ -0,0 +1,2 @@ +On Solaris, the :c:macro:`!Py_NAN` macro now expands to a :c:type:`!double` +instead of a function address. Patch by Bénédikt Tran.