From nobody Mon Jun 1 22:34:16 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gTpfc2f9Tz6gBfR for ; Mon, 01 Jun 2026 22:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gTpfc1jyWz3ky5 for ; Mon, 01 Jun 2026 22:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780353256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akexvP9h67wj4ZaC/ZvE0qKMl9QMM2Fug9kFL2ti1UA=; b=SxjKEoDjHhqr2NbRx/exjcjWNuey8Hy1pMW4rWsz7b6j+jaScwDLg1BY8OQW5Ne1hhdKsO Eb8hwsd0fRQsRHuOewh8erhyJ/dVqR7e9H59wr/VvaxyFbPSVq4MpYa9RcgLhhPki/UbkN MHagv+KhMMSxs+E3+1936GTmzqEcwdXF0No5yHIc9+GKh3K2hnd/swvysOsuHODrPvyDEG TU58/D+ea7cSjFsGpsUC3MMfX43eXQhFcWihOMSwen/DwVrtiQDNqJnFBydiAZECMZUxRp wYJ9ut/1YGZxV3s2aBhlk5uSr3YKzROl3U7z2vVk4zto5OQPUD4WdIkrPAttBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780353256; a=rsa-sha256; cv=none; b=iebc/pKdOSVIzkRefFHnzTM1fcRth+z795w+Ke3jpUWJ9+qOK3aqK53ZPg7sCQLOtPx4kE 8HTs1njsyq/Wzzr2/eQgXFbG/hnWRiRFbmIy1TEuWGc+35MBvJ1/FQW8RUguANZiO+m4DP qdqIVDQA0nfaNLZZGt5yVa+RwRV39j0gg8j3V9qCLO8bGL7O2Kh4n1gfjU2dhxkF40n0nX 5rnbldNKpFHSzsWhypZ3fY58kGk0Acbk2+bHscZ2I5uAd0hMMqWrAnLzvYRAHjhABQFc09 mQbfVjmpuo67e6osbeH3tfekA3Tt9xbhp12+/WwvJQwFUSbF5jjffEeVc1sgUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780353256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akexvP9h67wj4ZaC/ZvE0qKMl9QMM2Fug9kFL2ti1UA=; b=RhU/InIbhZlEVNEFaN96X2w4ztCMcgBv8S2WxygH4wdeUGbb/vvGTjPjs4B2c/lXcZdwFa 7drGv1OgMNjd1U2JvZoHyw17EjCfBUfu09kZ3zwXnDWt1uRWnFYvAsW5mzYWdyD0xbZk4v IHGQRGZsvt6IaPOhcVF1CUeP3Y2zCHK3KYWe9U0CVYQ5Qqi/YwW0vdf+z8WBottX6pSFxB batlbhSUVywTLjFRkl3fNb0FRq7/52EHyRdd1Gn1/Qs/1aGI2rjnzUZg7qEtLlvBtOlx12 TIxx/M8WTL88XfqShKjrIPRGBMTc5yDMmMnthwFLgP6yN0kTkEnqIfwlIvereA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gTpfc1Hr6zxp4 for ; Mon, 01 Jun 2026 22:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42606 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Jun 2026 22:34:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: =?utf-8?Q?Jes=C3=BAs?= =?utf-8?Q?Bl=C3=A1zqu?=ez From: Robert Clausecker Subject: git: f8a72f48951f - stable/15 - lib/msun: Replaced pattern to force exception in _num families List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f8a72f48951fc9f156f122ef6ba5181df85a12e6 Auto-Submitted: auto-generated Date: Mon, 01 Jun 2026 22:34:16 +0000 Message-Id: <6a1e08e8.42606.480ef7e9@gitrepo.freebsd.org> 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 AuthorDate: 2026-04-27 16:43:41 +0000 Commit: Robert Clausecker 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. */