From nobody Thu Jul 2 07:47:03 2026 X-Original-To: dev-commits-src-all@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 4grTVb5yxBz6kDQM for ; Thu, 02 Jul 2026 07:47:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4grTVb2Sk5z4MPj for ; Thu, 02 Jul 2026 07:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782978423; 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=zNO0GKRarlJvjKfbd2TaOAatbZHF/uAxthMiRDY0UHc=; b=T4gjB47XdguyYXgEnqKZMv5eILgVfQpocGR/egpFtLAzr4h0RRsl3sdG4sNBiJIbYLRD/p NkwmOuqaRZ0HsK7/I50b6KFUyG6tt6WTcwF6yU5Pknzz3Gut79NzjuX5q5jqwaiZbQOO5c HM72vnZrj/B3lmwG9uVuqV0SU7ny6UiERxWu0+StO2WL5jVbtOxvSbEOsXrQV4VyKe74dO p9OIL6LXPJjfuknlofTkxqE77sRSr5AZ5SwGDWbNczJT1vaR3cr/zUbYjHz1Gr81YkcZ1X jwWqhf/pTObjX1kx9UetpdYuB9dVJG2ymFlp6nQF5hd7srRe7mFdDKfq99HPkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782978423; a=rsa-sha256; cv=none; b=cOfxvTZQO9tspZN+L8yb0J0qtr5/lquL8PcukzM5vxDkVxV3WV8MUUcbqvH/gVHIhhKfcd vr3HTRLN1GOEBBt6aS9H/zhWCAHKsMSObVOKOd0OuMSdp0LWyaXixMXb/En+jTKAMMzWov iLL1cc23KOqCIEsk0bYOjCjYfAws98MfdPAYQ8LoDRZJCUJ0JjCy9iO3GwpvCooz2D/1w8 iTDOD1xgbfCfSy9vsCTVvQWZfEcr2exOwNTDbpWiX8uJNtP1N/MDce/ojCuSD1njisTWCI VUpDbmZ/AJfmedJrTodJz6oJMoa/82UpOGe1JhJL0fgDlQsy099sMT7n/iQBBQ== 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=1782978423; 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=zNO0GKRarlJvjKfbd2TaOAatbZHF/uAxthMiRDY0UHc=; b=HcYeCRwZmKK6iICcGc0ViJAzZNYCFPbvsDXVS8DXkrHu2KYmd1sQMBrPEP+vELXyHmiDWk rsZngCj5ob/ZmuF51OAoqJ9/BGK0cWUrL53imocDmJ5nqDkhyAVXY7vA3cx2Ox1t68W6a7 tvyoi9YvsAQDhH8xZs131gm4eHi8g+ykKpG3xVy2xvbTIWjqu/rV3kI+IhcX69OM3JrQvA RN9LP+ot7RpspNjK+K1oBVtopCyqwSqiuncT4DqP8eQ9ddm5DpQZP3UMsbIQK59d9Rj7xT Z6LpJb/dy88g9/pkKf6vLLKWUq7bd85hKuE7DSFMdQzw0OEU9+fIlRLBT5hDuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4grTVb0VQWzr8x for ; Thu, 02 Jul 2026 07:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 307fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Jul 2026 07:47:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Faraz Vahedi From: Robert Clausecker Subject: git: 3d3eeda198a9 - stable/15 - libc: Fix assert() sanitiser for C++ contextual bool conversion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3d3eeda198a924189b47eb0ba7f6f0dd3defbd89 Auto-Submitted: auto-generated Date: Thu, 02 Jul 2026 07:47:03 +0000 Message-Id: <6a461777.307fd.31c9d3ea@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3d3eeda198a924189b47eb0ba7f6f0dd3defbd89 commit 3d3eeda198a924189b47eb0ba7f6f0dd3defbd89 Author: Faraz Vahedi AuthorDate: 2026-06-06 11:38:47 +0000 Commit: Robert Clausecker CommitDate: 2026-07-02 07:44:26 +0000 libc: Fix assert() sanitiser for C++ contextual bool conversion Replace the `(bool(*)(bool))` probe in `__assert_sanitize()` with an unevaluated conditional expression, so types with `explicit operator bool()` that require a contextually converted constant expression of type `bool` are handled correctly. Ergo, arity check is now performed separately via `__assert_sanitize_arity()`, a unary template whose parameter pack must bind to exactly on argument after `__VA_ARGS__` is substituted into the call. Also align NDEBUG with C23 requirements. Reported by: dim, aokblast Signed-off-by: Faraz Vahedi Reviewed by: aokblast, fuz MFC after: 1 week Fixes: 867b51452ea78ece0b312a387e63fdbc2a11056a Pull Request: https://github.com/freebsd/freebsd-src/pull/2265 (cherry picked from commit 48d20fd1cf90179e778c6155900cbed2be140273) --- include/assert.h | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/include/assert.h b/include/assert.h index 75d3e62e8932..afbf2c1092e0 100644 --- a/include/assert.h +++ b/include/assert.h @@ -53,35 +53,15 @@ #endif /* __BSD_VISIBLE */ #else #ifdef __cplusplus -#if __cplusplus < 202002L -/* - * C++ modes prior to C++20 cannot simultaneously satisfy all three - * desirable properties of the sanitiser: - * - * Approach No double-eval Lambda support Arity check - * ----------------------------- -------------- -------------- ----------- - * sizeof(cast(expression)) yes no yes - * static_cast(expression) no yes no - * (void)bool(expression) no yes no - * - * NOTE: C++20 introduced lambdas in unevaluated contexts; see P0315R4. - * - * Since no approach satisfies all three below C++20, the least harmful - * choice is to forgo the check entirely rather than silently break one - * of the remaining guarantees. - * - */ -#define __assert_sanitize(...) ((void)0) -#else -#define __assert_sanitize(...) (void)sizeof(((bool(*)(bool))0)(__VA_ARGS__)) -#endif /* __cplusplus < 202002L */ +#define assert(...) ((void)(bool(__VA_ARGS__) ? ((void)0) : \ + __assert(__func__, __FILE__, __LINE__, \ + #__VA_ARGS__))) #else -#define __assert_sanitize(...) (void)sizeof(((_Bool(*)(_Bool))0)(__VA_ARGS__)) -#endif /* __cplusplus */ -#define assert(...) (__assert_sanitize(__VA_ARGS__), \ - (__VA_ARGS__) ? (void)0 : \ - __assert(__func__, __FILE__, \ +#define assert(...) ((void)sizeof(((_Bool(*)(_Bool))0)(__VA_ARGS__)), \ + (__VA_ARGS__) ? (void)0 : \ + __assert(__func__, __FILE__, \ __LINE__, #__VA_ARGS__)) +#endif /* __cplusplus */ #define _assert(...) assert(__VA_ARGS__) #if __BSD_VISIBLE #define __assert_unreachable() assert(0 && "unreachable segment reached")