From nobody Sun Nov 03 14:51:50 2024 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 4XhHcR0FWbz5cGgn; Sun, 03 Nov 2024 14:51:51 +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 4XhHcQ6ntPz49QD; Sun, 3 Nov 2024 14:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730645511; 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=Jjr8yhry1DAH3gnK0Oic9BPNO5eggFFKMi4ubermdBI=; b=kzNT3ptLCiKSU4JADz/qo1hfZ30wtl8qjb7K/XC6XS0NMGhqR+glI+twomcSXZS6ByLbTU Gs0l3tSQHIkYijKRwYwLB13rCGkPaBnaPtGaBs4U+6au8po4S7HVccHYyjyQZJK4rBopu1 UPxVe1buLcTiwYtB94HxaVIqk66uD6nLKZ6VHY/yjmzV7c1Rkk3tQndHQxRZZ5did9rvQy zIgOVu8tssJh3y0Sk3dlLCNgNqJfnIr808/VGVjiTqrpx72uax63TzevRInNTDdDu2Y18D D8djo+JmsdKJm+8q44k2xK3nUYhDk5YqawFy0ucylYYxU99jGO90W4GUAvVX5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730645511; 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=Jjr8yhry1DAH3gnK0Oic9BPNO5eggFFKMi4ubermdBI=; b=HCnamA+6l/HiAwvsWx+p64eaDLWLwWUCX3wyLjlv0rTCpX22xkprgP5J+ra8eNFudNI0b7 MapqEdDsE+JwpYHdYJIqE6MUAjFDlmiknQbc1i6p2srqEg3Wat1hHEm9G+dZM5XsOVFYAS k2xgMOZDlapWNYOirEvJfH4v12DpVyR915RJjs+/S8OBxyE2WihGCIycXHOwedxL41ebbB Usx7Gwq/XLFYQktjuDoxHMJsUotI4rXnQnEB25FGLihe/vl9eVNBl/5DnOl3baFq+2ZMd5 roYHwHAx40Dw9jNAdq/oy+1KOTyONFOyxSKYCqOkKK/CJBPKDeNL3gRv5TC5/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730645511; a=rsa-sha256; cv=none; b=SByFIgok9Lkjzq4QZzFc36xvoalzn1ZZ/7N0rLqreCAZX6Xra+G7vI3JIlhHq6VHyn3YWv jf8uIBq03k6hRMGAwACeF7sH311PmercauipDmGTy1NFOtYcuD37ur7c9CPkhAdFs1O40I DxrKRWcZdHSZxtAQ3T72YexN7EYQ+lTtj0XYCxdAnLKx7RZHhHyIT6ZgBFI1sOx4EmgfBU +L2zJx3N65UfeAyuEObSj5EM/QOTdf/Uq13CDUYE9Ic+yz5g08gBnbbI/uqLlXRey0XlcI MOfEfysznIMcexd16FQzkmxUE8HhmSRheGtBDbP9mwZ/sLch8inOdwG+B1DAPg== 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 4XhHcQ6JBSztdP; Sun, 3 Nov 2024 14:51:50 +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 4A3Epoa7082399; Sun, 3 Nov 2024 14:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3EpoJU082396; Sun, 3 Nov 2024 14:51:50 GMT (envelope-from git) Date: Sun, 3 Nov 2024 14:51:50 GMT Message-Id: <202411031451.4A3EpoJU082396@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: d9901a23bd2f - stable/14 - libcxxrt: Update to upstream 6f2fdfebcd62 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 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/stable/14 X-Git-Reftype: branch X-Git-Commit: d9901a23bd2f4e6aeef7f628f946134c4698fc38 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d9901a23bd2f4e6aeef7f628f946134c4698fc38 commit d9901a23bd2f4e6aeef7f628f946134c4698fc38 Author: Ed Maste AuthorDate: 2024-10-31 15:51:29 +0000 Commit: Ed Maste CommitDate: 2024-11-03 14:51:37 +0000 libcxxrt: Update to upstream 6f2fdfebcd62 Interesting fixes: 3cbfe5a556fe Avoid noreturn warning on terminate() (cherry picked from commit 2dccd21949f26b1bdf5e7cf258b760fffd3bf259) --- 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