From nobody Sat Jun 04 12:01:17 2022 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 8A5121B567EF; Sat, 4 Jun 2022 12:01:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LFddB5Qpvz4cBx; Sat, 4 Jun 2022 12:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344079; 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=2qjVeDnEg1aTELWMM87qxrwVtbmyvSShL5PQLM5N4jk=; b=MCoyUFxMpMsoLplqPsvBW67SROUM9MLrT1wbGNp7c53IEsVEaCPyjBR2Mwqw0HYmW+8Ye6 j/WTrEeY/peg3lyJLZ/P+vlH8HNsEgPsCGih4Y9uuiZsGXbykFgSolxUpvs0iTa38n1rDD YaqwvRdpjXdawJ9dYZv5kZsvlpY5pm9x6V/01gjv+raU4aNbDaLxq1iWDE0t1xMSHTYzZL qDppqbZHYquXQ8Mxvnmlo2OsugYgEAz3gvunHrtRfYUnjXytznN5nbizjUk/6Injzfc8jn Xbyx1mr5nFMC/dhGSLCyZsRb3/4PsiJeHj5PcwDZihMgKfR6G45ixua67kMZiw== 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 E035C1D06D; Sat, 4 Jun 2022 12:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 254C1Hfj093780; Sat, 4 Jun 2022 12:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254C1HDX093779; Sat, 4 Jun 2022 12:01:17 GMT (envelope-from git) Date: Sat, 4 Jun 2022 12:01:17 GMT Message-Id: <202206041201.254C1HDX093779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: ba5cf9c09f93 - stable/13 - Apply libc++ fix for firefox visibility push/pop issue 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ba5cf9c09f933bdcdb0fd415f3f3582bdf7ca8ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344079; 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=2qjVeDnEg1aTELWMM87qxrwVtbmyvSShL5PQLM5N4jk=; b=K/VCq/c0H1nQO0svEzdf7LlXHR2jlHDOqK9TYl1Bh+346fEcwi6aSVlZoEe/QuUyo8OEfi TXKWJ52nLGnCGXwpOrpQeKh/6LzQUseAjyBHlRIBz5nvDVlq+JlWVJkDwFwFnCqbxnkvOg iOKSNixnWJAZuOF1qgXLQ2R+Ldd/5GprHcUs80K/mBqV6VpRjbLkCOQUizye+KwoFJltph oxRcT2jvfBJ8NbUg+NR4X2krZcC6B+tJQRo+dsf5GqhGF6LndtABd2DXupBJDwO088Qwxk tIDQYgx+zSSK+cOVbPFm2c8SRgvV1AQ7MuLAPVUbcL2B/viWSKOAJzXJGDLlAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654344079; a=rsa-sha256; cv=none; b=RSeRH+TewxQfOdXz2KH6iqSrF7dnB/u81NFrQshX0JAnd0SImmSm4ps5HRP6X1ZDC2kxm1 0cLlyda14JGtgJdzby7P+5ZGp7iV0Vwa3jrxHPFdmQGR/u28EIzzEP+rIytlHMD4hH2aQ6 HzrWv63uMBTuJMFOPs+2jAV1HUkcS7PdjWnYHVGE15mu5aFb89c7NQaswNw+ceAnYK+AYK BKYTR5zFQoumI72dr3A+8Kqx6NvMPY83Jr0hhFtpNupmdRQfZXvKQDe8RWmZxd9wdkAifo IFCH5rNfzHYQuH2ypQbCyYqaz6ouFULzssEgizk/jCFdAitVH+ekNaPojypjew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ba5cf9c09f933bdcdb0fd415f3f3582bdf7ca8ec commit ba5cf9c09f933bdcdb0fd415f3f3582bdf7ca8ec Author: Dimitry Andric AuthorDate: 2022-03-15 20:32:06 +0000 Commit: Dimitry Andric CommitDate: 2022-06-04 11:59:53 +0000 Apply libc++ fix for firefox visibility push/pop issue Merge commit 7ab1ab0db401 from llvm git (by Dimitry Andric): [libc++] Make __dir_stream visibility declaration consistent The class `__dir_stream` is currently declared in two places: as a top-level forward declaration in `directory_iterator.h`, and as a friend declaration in class `directory_entry`, in `directory_entry.h`. The former has a `_LIBCPP_HIDDEN` attribute, but the latter does not, causing the Firefox build to complain about the visibility not matching the previous declaration. This is because Firefox plays games with pushing and popping visibility. Work around this by making both `__dir_stream` declarations consistently use `_LIBCPP_HIDDEN`. Reviewed By: ldionne, philnik, #libc Differential Revision: https://reviews.llvm.org/D121639 (cherry picked from commit a1f13cbcbb26465d8b54c18a294896add63d6536) --- contrib/llvm-project/libcxx/include/__filesystem/directory_entry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__filesystem/directory_entry.h b/contrib/llvm-project/libcxx/include/__filesystem/directory_entry.h index 91dd1a214588..95e45c02307f 100644 --- a/contrib/llvm-project/libcxx/include/__filesystem/directory_entry.h +++ b/contrib/llvm-project/libcxx/include/__filesystem/directory_entry.h @@ -249,7 +249,7 @@ public: private: friend class directory_iterator; friend class recursive_directory_iterator; - friend class __dir_stream; + friend class _LIBCPP_HIDDEN __dir_stream; enum _CacheType : unsigned char { _Empty,