From nobody Sat Apr 25 14:20:13 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 4g2sRf38LDz6bZNG for ; Sat, 25 Apr 2026 14:20:14 +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 4g2sRd5hlMz3JDG for ; Sat, 25 Apr 2026 14:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126813; 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=yAdsvAB1hYd9+vDfd861YgwemxwZR+XLFV25NrA4sVI=; b=gQWekdCXCMAh9Arzt+oX4sGELYS5DsE62keONBBVmqUoWCeAsbBLurZ2iAa9Kg66mKdqiP 29PIJsRUVG8UNqmbybmyIO2uwkByOUpIQML14hPV2sSS+ayA+E8MtGgEPLJYNllXOHH96o cqpG1j7jSh1aXJkBytJTiuQgzi2xRkJqZAncbhX7nfStdtEJwsYjUrX9MoarJAkkr9VVLx VYC/PdEGxIvyI0tN5KZW2RAu+WZiKYNQfv/Gjd4nWOsvuhHQ1DaCcuH6e0O4abAm2beiTJ AWvsuzH3Cg0NJc4B2QKrAddueuL4lCHORrty7JG53LguFET2HvfMXcU+kLTG+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126813; a=rsa-sha256; cv=none; b=QQKfFOCKyYb3CH2VJhVilXHwMiVu1+7SWz+4AodxeJXX5ACEb1mJz57LlDPIDbzVcAw1eO 37/GozAXOLkAb2dOVaXGyT0OB0Hcxh4gjeMTD9hLqxOKXmgzfriB9mrLnfnDoxr/YXoD/u 0EdnGhA0hb/X/Ygg3PaP4nqmzasvYYR3UC5Wv6edAuhwbwg0MExHjopBorhnFBzvE275pY vBCthBPkVszSpCKHyEtHD8con5YVxU6DrtK4G3qenYyeoO7JoYSxUIXrLGeQzL5mev1JC7 dkq7tV7745Jxy9yilEZWO5cT8h0t4JeVE1Tz6vNL3gJq7/AKRofJc2skGMvqvQ== 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=1777126813; 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=yAdsvAB1hYd9+vDfd861YgwemxwZR+XLFV25NrA4sVI=; b=GhE/jckzGJd7KXDNDr7TiCblvGMGDMDBh1fck3Vf52C4wByj9nQMohz6bNFgRFKEeUcSjY PN/VkAtnbaikjkP8zT1rzKjKFKi/+u/wAV7j0sz95q2IWh5U1E/ogvpZDV0KnKcYDg/bNk PGChrO43aeOQPH3GCz6HA3gU9mUZFvOJhKmzBG/SgsH5vqHVSshGgl8S9LyIYzegEpfe1w S3UCTi6gUkYqV/OmNDWdZaqaS2UqGbmczRK16Aq8eSs60lUEyIGUI8F3D2YkzqWZwgPExt f3GhSVM9cnK8Q6jtcMd3Oi/qxOAZeywKL4GY6RpPRAxV2HahUWjKvhV1iOwwVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRd4sqRzcr1 for ; Sat, 25 Apr 2026 14:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3880c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:20:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Dimitry Andric From: Dimitry Andric Subject: git: 987ac31018cb - main - libcxx-compat: fix llvmorg-21-init-18351-gfcc09b6f0267: 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 987ac31018cba9f1763ad3acfb68b933f58a4c52 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:20:13 +0000 Message-Id: <69eccd9d.3880c.49960f9f@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=987ac31018cba9f1763ad3acfb68b933f58a4c52 commit 987ac31018cba9f1763ad3acfb68b933f58a4c52 Author: Dimitry Andric AuthorDate: 2026-01-05 20:31:45 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:14:21 +0000 libcxx-compat: fix llvmorg-21-init-18351-gfcc09b6f0267: [libc++] Fix std::make_exception_ptr interaction with ObjC (#135386) Clang treats throwing/catching ObjC types differently from C++ types, and omitting the `throw` in `std::make_exception_ptr` breaks ObjC invariants about how types are thrown/caught. Fixes #135089 Co-authored-by: Louis Dionne Only use lambdas when in !defined(_LIBCPP_CXX03_LANG), so this will compile with clang 18 and lower, in C++03 mode and earlier. PR: 292067 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__exception/exception_ptr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__exception/exception_ptr.h b/contrib/llvm-project/libcxx/include/__exception/exception_ptr.h index 796fa924be12..130e90621709 100644 --- a/contrib/llvm-project/libcxx/include/__exception/exception_ptr.h +++ b/contrib/llvm-project/libcxx/include/__exception/exception_ptr.h @@ -93,7 +93,7 @@ public: }; # if _LIBCPP_HAS_EXCEPTIONS -# if _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION +# if _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION && !defined(_LIBCPP_CXX03_LANG) template _LIBCPP_HIDE_FROM_ABI exception_ptr __make_exception_ptr_explicit(_Ep& __e) _NOEXCEPT { using _Ep2 = __decay_t<_Ep>;