From nobody Sat May 14 11:50:00 2022 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 E771D1ACC5AA; Sat, 14 May 2022 11:50:01 +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 4L0kMr5kSrz3rc4; Sat, 14 May 2022 11:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652529001; 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=E500VMq2N/vJG0sw4JZXWiVtknsx9Dj+uozoERsJt+U=; b=r1ib3arC64+BJwiZNVnZXa/PjZjHP3UrADga0g1mhLW1uzG7TBgpTNSHs/535lvOqIkXOE D+tTu5M5H5Va3OqB7KrReLMxD0uH4BM82fPzvPnyFw2Cq9OP1ghxBjK9HNt+HVZ4kJ6Wfh qR4H/B3lpsl0CGR2MwBpk6FEdVnG6MnhbhG4dUx5u8h5d6xbNQTFnGlCoVWr7Ix+5KFVwk Wg2IIH0KhOC7/jLoR0eUjh6nQx7cCQMCetuBhTDFTjLI/nAM9OUfAwBo7MrcrlHsS2a57s e+YRC+IdjNUss2N1jd1u2I9qGOkAzV7qgrifPcEa4EopskrrxAT9C/r9YjDZPg== 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 7CC8516AD8; Sat, 14 May 2022 11:50:00 +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 24EBo0Hk016487; Sat, 14 May 2022 11:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24EBo0Eb016474; Sat, 14 May 2022 11:50:00 GMT (envelope-from git) Date: Sat, 14 May 2022 11:50:00 GMT Message-Id: <202205141150.24EBo0Eb016474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: a1f13cbcbb26 - main - Apply libc++ fix for firefox visibility push/pop issue 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: a1f13cbcbb26465d8b54c18a294896add63d6536 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652529001; 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=E500VMq2N/vJG0sw4JZXWiVtknsx9Dj+uozoERsJt+U=; b=VYV7P5Uqjt//20JkQa7N3MGZ+V15O+T0FojSAtSvMQEOjzPRxfnZ0ctjdyDyJzHc9Xpr1A XKFDgfrM7vY2Pd6FktO3Wh7ln3YJnfvJaDceOJdOwYqhoQEwLtKR8oumVR1iLq02M+X+Cb E04pPWB5VW+GlA1LBUO51YX8vK8WbbfYXJRhQXEbk2cZk/DPoyJdtZuJ3F8v3K35mLnYG6 2anUWO8ilmJOt7mpTRKXDLGKEG4HINJ+u0oXqlT5OCEKCzcQ6hMBgFfdvvHxX1X7gMQQPP hKFJTjNCJqXBahe9WxdCtHXBGNyituvgipRSPRFKixFBbkZxFwMJUoQLePtd/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652529001; a=rsa-sha256; cv=none; b=KBcwB418dHi6VtnS/lL0Ttl9IhyKQprPbWdwyMUxcsqqUqfZHJwVh7D7umbsPSKOUNNnpy +lAI02MQjdu8J7OfzclZLv9zJ5GAycpsDhaRArXp4r0qbQbfVmO1QomALLKCmfiMj9jap0 5mekTkfzpWM58mrlFXE9fFEldapHXBFNTTKZSqsI12ZCkxF/g3BbbTSL/qPIAns+0G7gQz 8RnBl9OY1hceeNB42pgoYqjM3m3yHx5hWmkFzBl6/dx6AAi0Zu2QKd/N5uyzKCisiNW4Vd QFiripLNFV4C8EEGMcRu1tT4AcIDZQrugahJ+h3T/Yq6XaD3Hc1oUQc5Oqh36w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a1f13cbcbb26465d8b54c18a294896add63d6536 commit a1f13cbcbb26465d8b54c18a294896add63d6536 Author: Dimitry Andric AuthorDate: 2022-03-15 20:32:06 +0000 Commit: Dimitry Andric CommitDate: 2022-05-14 11:46:21 +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 --- 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,