git: f8a72f48951f - stable/15 - lib/msun: Replaced pattern to force exception in _num families
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 01 Jun 2026 22:34:16 UTC
The branch stable/15 has been updated by fuz:
URL: https://cgit.FreeBSD.org/src/commit/?id=f8a72f48951fc9f156f122ef6ba5181df85a12e6
commit f8a72f48951fc9f156f122ef6ba5181df85a12e6
Author: Jesús Blázquez <jesuscblazquez@gmail.com>
AuthorDate: 2026-04-27 16:43:41 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2026-06-01 22:33:34 +0000
lib/msun: Replaced pattern to force exception in _num families
Replaced the old pattern of using a ternary to force addition
(raising exceptions for sNaN's) with a new one using a volatile
variable. The _mag_num family was already implemented with this pattern
PR: 294719
Reviewed by: fuz, kargl
MFC after: 1 month
(cherry picked from commit 7c20e15592a07ea457cacb0d6706948815c8420e)
---
lib/msun/src/s_fmaximum_num.c | 14 ++++++++++----
lib/msun/src/s_fmaximum_numf.c | 14 ++++++++++----
lib/msun/src/s_fmaximum_numl.c | 14 ++++++++++----
lib/msun/src/s_fminimum_num.c | 14 ++++++++++----
lib/msun/src/s_fminimum_numf.c | 14 ++++++++++----
lib/msun/src/s_fminimum_numl.c | 14 ++++++++++----
6 files changed, 60 insertions(+), 24 deletions(-)
diff --git a/lib/msun/src/s_fmaximum_num.c b/lib/msun/src/s_fmaximum_num.c
index cf16c76f89b9..c3aae90af8e3 100644
--- a/lib/msun/src/s_fmaximum_num.c
+++ b/lib/msun/src/s_fmaximum_num.c
@@ -53,12 +53,18 @@ fmaximum_num(double x, double y)
nan_y = u[1].bits.exp == 2047 && (u[1].bits.manh | u[1].bits.manl) != 0;
if (nan_x || nan_y) {
- /* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+ /* If both are NaN, adding returns qNaN */
if (nan_x && nan_y)
- return (x + y);
+ return (x + y);
+
+ /* force_except makes sure sNaN's raise exceptions */
+ volatile double force_except = x + y;
+ force_except;
+
if (nan_x)
- return ((x + y) != 0.0 ? y : y);
- return ((x + y) != 0.0 ? x : x);
+ return (y);
+ else
+ return (x);
}
/* Handle comparisons of signed zeroes. */
diff --git a/lib/msun/src/s_fmaximum_numf.c b/lib/msun/src/s_fmaximum_numf.c
index c30179e47f9e..21a3d8672f98 100644
--- a/lib/msun/src/s_fmaximum_numf.c
+++ b/lib/msun/src/s_fmaximum_numf.c
@@ -52,12 +52,18 @@ fmaximum_numf(float x, float y)
nan_y = u[1].bits.exp == 255 && u[1].bits.man != 0;
if (nan_x || nan_y) {
- /* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+ /* If both are NaN, adding returns qNaN */
if (nan_x && nan_y)
- return (x + y);
+ return (x + y);
+
+ /* force_except makes sure sNaN's raise exceptions */
+ volatile float force_except = x + y;
+ force_except;
+
if (nan_x)
- return ((x + y) != 0.0 ? y : y);
- return ((x + y) != 0.0 ? x : x);
+ return (y);
+ else
+ return (x);
}
/* Handle comparisons of signed zeroes. */
diff --git a/lib/msun/src/s_fmaximum_numl.c b/lib/msun/src/s_fmaximum_numl.c
index 2291d01ca4f4..f806d97bd813 100644
--- a/lib/msun/src/s_fmaximum_numl.c
+++ b/lib/msun/src/s_fmaximum_numl.c
@@ -47,12 +47,18 @@ fmaximum_numl(long double x, long double y)
nan_y = u[1].bits.exp == 32767 && (u[1].bits.manh | u[1].bits.manl) != 0;
if (nan_x || nan_y) {
- /* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+ /* If both are NaN, adding returns qNaN */
if (nan_x && nan_y)
- return (x + y);
+ return (x + y);
+
+ /* force_except makes sure sNaN's raise exceptions */
+ volatile long double force_except = x + y;
+ force_except;
+
if (nan_x)
- return ((x + y) != 0.0 ? y : y);
- return ((x + y) != 0.0 ? x : x);
+ return (y);
+ else
+ return (x);
}
/* Handle comparisons of signed zeroes. */
diff --git a/lib/msun/src/s_fminimum_num.c b/lib/msun/src/s_fminimum_num.c
index 71b5f072c32d..562d7932b464 100644
--- a/lib/msun/src/s_fminimum_num.c
+++ b/lib/msun/src/s_fminimum_num.c
@@ -53,12 +53,18 @@ fminimum_num(double x, double y)
nan_y = u[1].bits.exp == 2047 && (u[1].bits.manh | u[1].bits.manl) != 0;
if (nan_x || nan_y) {
- /* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+ /* If both are NaN, adding returns qNaN */
if (nan_x && nan_y)
- return (x + y);
+ return (x + y);
+
+ /* force_except makes sure sNaN's raise exceptions */
+ volatile double force_except = x + y;
+ force_except;
+
if (nan_x)
- return ((x + y) != 0.0 ? y : y);
- return ((x + y) != 0.0 ? x : x);
+ return (y);
+ else
+ return (x);
}
/* Handle comparisons of signed zeroes. */
diff --git a/lib/msun/src/s_fminimum_numf.c b/lib/msun/src/s_fminimum_numf.c
index d5bab31ce403..575a3c70cba7 100644
--- a/lib/msun/src/s_fminimum_numf.c
+++ b/lib/msun/src/s_fminimum_numf.c
@@ -52,12 +52,18 @@ fminimum_numf(float x, float y)
nan_y = u[1].bits.exp == 255 && u[1].bits.man != 0;
if (nan_x || nan_y) {
- /* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+ /* If both are NaN, adding returns qNaN */
if (nan_x && nan_y)
- return (x + y);
+ return (x + y);
+
+ /* force_except makes sure sNaN's raise exceptions */
+ volatile float force_except = x + y;
+ force_except;
+
if (nan_x)
- return ((x + y) != 0.0 ? y : y);
- return ((x + y) != 0.0 ? x : x);
+ return (y);
+ else
+ return (x);
}
/* Handle comparisons of signed zeroes. */
diff --git a/lib/msun/src/s_fminimum_numl.c b/lib/msun/src/s_fminimum_numl.c
index 6b26d2218d42..60248eba48f3 100644
--- a/lib/msun/src/s_fminimum_numl.c
+++ b/lib/msun/src/s_fminimum_numl.c
@@ -47,12 +47,18 @@ fminimum_numl(long double x, long double y)
nan_y = u[1].bits.exp == 32767 && (u[1].bits.manh | u[1].bits.manl) != 0;
if (nan_x || nan_y) {
- /* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+ /* If both are NaN, adding returns qNaN */
if (nan_x && nan_y)
- return (x + y);
+ return (x + y);
+
+ /* force_except makes sure sNaN's raise exceptions */
+ volatile long double force_except = x + y;
+ force_except;
+
if (nan_x)
- return ((x + y) != 0.0 ? y : y);
- return ((x + y) != 0.0 ? x : x);
+ return (y);
+ else
+ return (x);
}
/* Handle comparisons of signed zeroes. */