From nobody Tue Nov 05 04:20:34 2024 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 4XjFW70hNTz5d0Ts; Tue, 05 Nov 2024 04:20:35 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjFW66JHhz4GjT; Tue, 5 Nov 2024 04:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WZg9NTraYBNmx50VxF0xabAarMLj489S90y8g4r43c=; b=tt7o58rMrMPtsQrPLuSRegxV+XMm3RQuaHXRBwLUFW1R3lexiVXI/nxIP5DozN3LAWUyL3 51d1HGQOFPS7Y+2XpO/iY/C3PrsbGN1tqB3KrOBj7SzeTolu3gPEe7azrAh3eOJpPh3Adn vlP7G/M0ft4sl8WNoB/adziSJtpbC9xQVp59/KptwYGKnO3eDgBlYm0l1/c2UZXmehFZ2C HW2bPZPb+sIWKSRDPA6cR15NcOp0i6FANHxIMJ8rHCwac8AJhJOx75qGBuDnJnunh3xpqs pDkk2PPkRbPCxzx2qJj4zkizgy1mLLHNKkYdePl4NEeIdMsFk2dqEYcQ3/cAzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WZg9NTraYBNmx50VxF0xabAarMLj489S90y8g4r43c=; b=pMfO1hqt6j6JZPoYQnDInAjk1Yf84uroqYgMFakVg893lD7aahHOXVb0iwSbxNWrDACoNm elj+UVZPgNASjZ/ALWwtrZcJt9PRIMYgY5O0H9wSXPyNwtD8pkq9cKKR5eMcL0hSyI96fT UiuaDNllGPK0RRKhyL8FAue2uhw+qow3C51xePHG1lUCO6q/YVTZ6nIikZPBWz1/EcvM18 q1XpCholgT+XvH+uHpFYcHeez94jLfdTqgGjTHD+r/JCrxYdFdA5g8xcK59UXsdD+MgoB3 6BdAOjJvmcLjmRXdIQgq9Qqkm6QwoK/jc0VvTNcKwH7wHfAePS+PAL8BXYTt9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730780434; a=rsa-sha256; cv=none; b=gQZ+UcqRddnpHn2FZIMdRY8Wvbm5g9ukGJKZBh6GXsdjf9ek38pu5F9rXn31lLyfb7ajL9 2bAnKq58gWGFq6zKVvqZ6LAIJncxZynBP6im9Smc8ISPiW3AGaANsR3O1tWbYp2KjoZGez +FM9P6K4MoSjmdR7KP9/6UVycd2gnZZreLuZ9y63c5S6tA4mUlmnj5y9b+JuCRrPpv2O7m e9eTPGWcj8Rs0o1BNnVhqavq403MgvrK0DzU1gg+HXqYHzYHr35pyEKqkXFT2EOt///Jhm cy+/CCztEnfyD8s9MU/HIEklGiVTwcC6jYcCfJHsn1IF3obeRKqtFWU02okYtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XjFW65kY0z12bK; Tue, 5 Nov 2024 04:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A54KY1M058152; Tue, 5 Nov 2024 04:20:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A54KYEp058149; Tue, 5 Nov 2024 04:20:34 GMT (envelope-from git) Date: Tue, 5 Nov 2024 04:20:34 GMT Message-Id: <202411050420.4A54KYEp058149@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d0dcee46d971 - releng/14.2 - libcxxrt: Update to upstream 6f2fdfebcd62 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: d0dcee46d971c79257be42b0e50cd9183c79fcbb Auto-Submitted: auto-generated The branch releng/14.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d0dcee46d971c79257be42b0e50cd9183c79fcbb commit d0dcee46d971c79257be42b0e50cd9183c79fcbb Author: Ed Maste AuthorDate: 2024-10-31 15:51:29 +0000 Commit: Ed Maste CommitDate: 2024-11-05 04:19:58 +0000 libcxxrt: Update to upstream 6f2fdfebcd62 Interesting fixes: 3cbfe5a556fe Avoid noreturn warning on terminate() (cherry picked from commit 2dccd21949f26b1bdf5e7cf258b760fffd3bf259) (cherry picked from commit d9901a23bd2f4e6aeef7f628f946134c4698fc38) Approved by: re (cperciva) --- contrib/libcxxrt/exception.cc | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc index c87fe5ac4468..5034809a1380 100644 --- a/contrib/libcxxrt/exception.cc +++ b/contrib/libcxxrt/exception.cc @@ -237,7 +237,7 @@ static_assert(offsetof(__cxa_dependent_exception, unwindHeader) == namespace std { - void unexpected(); + [[noreturn]] void unexpected(); class exception { public: @@ -1530,28 +1530,34 @@ namespace std if (0 != info && 0 != info->terminateHandler) { info->terminateHandler(); - // Should not be reached - a terminate handler is not expected to - // return. - abort(); } - terminateHandler.load()(); + else + { + terminateHandler.load()(); + } + // Should not be reached - a terminate handler is not expected + // to return. + abort(); } /** * Called when an unexpected exception is encountered (i.e. an exception * violates an exception specification). This calls abort() unless a * custom handler has been set.. */ - void unexpected() + [[noreturn]] void unexpected() { static __cxa_thread_info *info = thread_info(); if (0 != info && 0 != info->unexpectedHandler) { info->unexpectedHandler(); - // Should not be reached - a terminate handler is not expected to - // return. - abort(); } - unexpectedHandler.load()(); + else + { + unexpectedHandler.load()(); + } + // Should not be reached - a unexpected handler is not expected + // to return. + abort(); } /** * Returns whether there are any exceptions currently being thrown that