From nobody Sat May 2 14:56:16 2026 X-Original-To: dev-commits-src-main@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 4g79w100Pfz6c4bW for ; Sat, 02 May 2026 14:56:17 +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 4g79w045w5z45XD for ; Sat, 02 May 2026 14:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777733776; 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=STJR+UDQR2ftW56T5hUpMLVz9h2d4TRoNYQaHsr0Clw=; b=wPnuSRlFdCLT0eZYHdUfi8CLxtO3po3TyHqqZplzStSa2pKNkrShkBqxawXoU/H+kDJDP8 hDOId8KPd9x5Bts0UqIO4e3LSgxiUrJRGWldLtUwH0eob+TvKL9AItKgnUabazW8ri8zn3 BGE0l8aukFn4OwN0xobB4eJpxwqhrAgNv2dt9ToAK0A6Re8jgKvhoEV8OIqUF+SqTcikVs 65NcPvqV52DLtllSrb2XjCX+AEfBlEEFmccEl60wm/yD5/zQE2YncYYfio0HRKnEomSU/b VLgm7h3BBmxZ/C9v92bwzpKY06b6HaaO6YrfvGQxJCyAxxh6/Qc9t5iGFuCkGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777733776; a=rsa-sha256; cv=none; b=qkVKpTkrJvaLwDnbmHLxWYMoahms7WBXFltbcOkDSbgJ1LrttXAmBS5ImyQ8yUTLYEfwnN 8b6Rgv/1WEmAuq9bfy9UXc/Z86mTiw16rSeJeLgWYkTstnwAA8CQB3KwJ24O4vuXtO+Qml PVIbmbfLCpxgGk3nMPzpXX6rQWmTpNGuaDISO/FnnKiCRKnBdN90eKayZh5L9+Ydeo6C+H FxA/i/qv2QMUKO1xruwX48wXleqyHWCpPvA2ggXKwDlGOpuGIUq/CGM9grWfRkiPFDw/Ia R8yph+8kvwnxuK/SqYATrSe6jcJLep7LkErsnryS5PwdDKZ9vhAeKW7nZWIHvw== 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=1777733776; 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=STJR+UDQR2ftW56T5hUpMLVz9h2d4TRoNYQaHsr0Clw=; b=vHA6J8iaaNA8sSL72e5/0pEmtfTWAsJL7OwiyEdczF0SqcXly/mxJ6mQjIBDrumyYUPlFv 3v2H73BjiH+maT9BmkIPzL+iNDh+oua1GZrTdc/G/x3NzUG/DSp0GjDlvc++Mhc6Ahf661 CNP0Ua1BFt6EHkKaU4H+nyPggtrpHhTbZR1gAHFRk8BGeANcBNkEO08zZyCXxTQG0py+U8 WjMQBE+UIaBf3TRqVUlj2e4s7wdKncnV77tlJj8EGOw1RyyGWfa+fk2D0sqxvNUIyxtXPg AUq3EyP1U+h0rwdZRD7YpDYqgNncYQlEWW9+68Ts/5kl8LsuLBIHOOUYvh9PZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g79w03YqFzrCZ for ; Sat, 02 May 2026 14:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47462 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 02 May 2026 14:56:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: =?utf-8?Q?Jes=C3=BAs?= =?utf-8?Q?Bl=C3=A1zqu?=ez From: Robert Clausecker Subject: git: 7c20e15592a0 - main - lib/msun: Replaced pattern to force exception in _num families List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: 7c20e15592a07ea457cacb0d6706948815c8420e Auto-Submitted: auto-generated Date: Sat, 02 May 2026 14:56:16 +0000 Message-Id: <69f61090.47462.d613e0d@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=7c20e15592a07ea457cacb0d6706948815c8420e commit 7c20e15592a07ea457cacb0d6706948815c8420e Author: Jesús Blázquez AuthorDate: 2026-04-27 16:43:41 +0000 Commit: Robert Clausecker CommitDate: 2026-05-02 14:50:49 +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 --- 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 c7cfcd26fd70..4d7c860d2ce9 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 = isnan(y); 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 60a7ccae343e..b41f293a428d 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 = isnan(y); 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 a2a5383ab85a..74a3d9ba2211 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 = isnan(y); 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 a5fd657955c5..67999c366a76 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 = isnan(y); 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 d5e8f0812bdb..c4b686be158e 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 = isnan(y); 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 dc0884002499..b30fbc721b6b 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 = isnan(y); 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. */