From nobody Wed Jun 24 17:36:30 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 4glpyQ6K37z6jXyL for ; Wed, 24 Jun 2026 17:36:30 +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 4glpyQ3m7Lz3Yn8 for ; Wed, 24 Jun 2026 17:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782322590; 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=0ceMNsHF55UoB7oKG16eAmbjUIQ0CdXL0hbdA0slabc=; b=drh7tn+Ui8oJA7v5aagZ3fBzfrwTC40NBH1eKOq8M+phnrGAYYWXX+Ljy2UYYTNMKyuqW/ /zj5EygSKkOkslszVs8zzA+tZHAHmgLc41C/W98K41x3RxcEIYUtq54Qv3jVtShUCrdXFo bB5L2ba32YnUkvAO1aoW9YUT9zhIz/6r1XoNHpY5kkSkXIcURgmtTrvjFxUwpHAn9oWMMZ Yvklj2kpxNrYNaxWhhHl6Y8n5y2uk38y2oisoFrPzelcnIIz/WfZqjJB8mSb26MLMdjKvZ Er3Za91ELSrrUUKdlRmDLg7UCPg1NzmyRKA76tSYy/ZftqVBVByrkq/2knosnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782322590; a=rsa-sha256; cv=none; b=e1qNpFljOI3RkVESKGCtQAGx/Sz+KHlcnX4sZ42IESgFUaiH9LJGZ6aqkSQdEEACj3ny7X a4PPn+yYtwooiNQz2DiclXXYyVC0y0lkh9n0brY6Zq2imFE+4kHqgKFsOL9zvwOrrRRCnJ 7WTW73qssaoIjK8zVTBp552dlMKOaV30KkqAAGJ2EV8o9c+SHXnfV8I/TA+Q16AZ637uMf OgnaH/PpUK6IvILJIxDl5fBM9+J2+D4kXJoDwxRXEqWlPU32rfQ5z3PLVlzLUXdemQZZs/ r23lKLWdRFFo46hzPeJut+hnQw96Y34pgbx5GXGW7u2i5D1SHiQ5mdmq7TPaqg== 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=1782322590; 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=0ceMNsHF55UoB7oKG16eAmbjUIQ0CdXL0hbdA0slabc=; b=jY7gDkw3w/32EdKd8DAkRsKtKxPCBJxj3ytrT3HJwvBd/Eqhhz/aQTpA0Z5VbwRJVFB8sD bxDBu2neEFJ8sH5qeZO+gLigM9171OpztveCad1HGUu+qE8Y4GF75SGX2TbNzxuF9lk6M0 azm1mJRlfGp2XZNG1NCtk7EjpO8HRlKStheNUx6qXJJkEII4Mtd/sHj3ziUXSXlFfTo6iV 6pnO4CSwPFTjuzSmcldLNkkKY3deEPv7uC+1MEe2a2jrNOooG4MHfYdbG+UUsF8cStSdqv 7Y8Cj8tV8ENShKRhQpEoHo9EwIh3rvpuRxItOPuzc6q4SV9/PYXq2XcqdChHAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4glpyQ2k4LzVDS for ; Wed, 24 Jun 2026 17:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3772d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Jun 2026 17:36:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3a5c2899fc7b - main - libcxxrt: Fix diagnostics for derived classes 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 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a5c2899fc7bd0865b5aacccc3465e46e9bc6df3 Auto-Submitted: auto-generated Date: Wed, 24 Jun 2026 17:36:30 +0000 Message-Id: <6a3c159e.3772d.588a1420@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3a5c2899fc7bd0865b5aacccc3465e46e9bc6df3 commit 3a5c2899fc7bd0865b5aacccc3465e46e9bc6df3 Author: Ed Maste AuthorDate: 2026-06-24 15:06:51 +0000 Commit: Ed Maste CommitDate: 2026-06-24 17:36:13 +0000 libcxxrt: Fix diagnostics for derived classes In terminate_with_diagnostics the cast_to arguments were swapped, so it always failed. The diagnostic handler produced output like "Terminating due to uncaught exception 0x24891e08000 of type std::runtime_error". Now, e->what() will actually be included in the output, e.g. "Terminating due to uncaught exception 0x2bba49208000 'Model file doesn't exist' of type std::runtime_error". Reviewed by: dim Event: Halifax Hackathon 202606 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57822 --- contrib/libcxxrt/exception.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/libcxxrt/exception.cc b/contrib/libcxxrt/exception.cc index 5034809a1380..883361bff084 100644 --- a/contrib/libcxxrt/exception.cc +++ b/contrib/libcxxrt/exception.cc @@ -344,7 +344,7 @@ static void terminate_with_diagnostics() { if (throw_ti) { std::exception *e = - static_cast(e_ti->cast_to(static_cast(ex+1), throw_ti)); + static_cast(throw_ti->cast_to(static_cast(ex+1), e_ti)); if (e) { fprintf(stderr, " '%s'", e->what());