From owner-svn-src-head@freebsd.org Wed Aug 21 13:07:58 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E7292C8484; Wed, 21 Aug 2019 13:07:58 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46D7Hy5sYpz3wnn; Wed, 21 Aug 2019 13:07:58 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 618AF4521; Wed, 21 Aug 2019 13:07:58 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [192.168.1.58] (92-111-45-100.static.v4.ziggozakelijk.nl [92.111.45.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 2E063252; Wed, 21 Aug 2019 15:07:57 +0200 (CEST) From: Dimitry Andric Message-Id: Content-Type: multipart/signed; boundary="Apple-Mail=_CF6FB93D-1E70-4E41-974C-55A7A4FCF69D"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\)) Subject: Re: svn commit: r351253 - in head/contrib/libc++: include src Date: Wed, 21 Aug 2019 15:07:56 +0200 In-Reply-To: <20190821144908.7137e6bc@FreeBSD.org> Cc: src-committers , svn-src-all , svn-src-head@freebsd.org, Marshall Clow To: =?utf-8?Q?T=C4=B3l_Coosemans?= References: <201908201739.x7KHdXvv054610@repo.freebsd.org> <20190821144908.7137e6bc@FreeBSD.org> X-Mailer: Apple Mail (2.3445.104.11) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Aug 2019 13:07:59 -0000 --Apple-Mail=_CF6FB93D-1E70-4E41-974C-55A7A4FCF69D Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 On 21 Aug 2019, at 14:49, T=C4=B3l Coosemans wrote: >=20 > On Tue, 20 Aug 2019 17:39:33 +0000 (UTC) Dimitry Andric > wrote: >> Author: dim >> Date: Tue Aug 20 17:39:32 2019 >> New Revision: 351253 >> URL: https://svnweb.freebsd.org/changeset/base/351253 >>=20 >> Log: >> Pull in r368867 from upstream libc++ trunk (by Marshall Clow): >>=20 >> Rework recursive_timed_mutex so that it uses __thread_id instead = of >> using the lower-level __libcpp_thread_id. This is prep for fixing >> PR42918. Reviewed as https://reviews.llvm.org/D65895 >>=20 >> Pull in r368916 from upstream libc++ trunk (by Marshall Clow): >>=20 >> Fix thread comparison by making sure we never pass our special = 'not a >> thread' value to the underlying implementation. Fixes PR#42918. >>=20 >> This should fix std::thread::id::operator=3D=3D() attempting to call >> pthread_equal(3) with zero values. ... > This seems to break building Firefox: >=20 > In file included from = /home/root/obj/ports/home/tijl/projects/freebsd/ports/head/www/firefox/wor= k/firefox-68.0.2/media/mtransport/nricectx.cpp:82: > In file included from = /home/root/obj/ports/home/tijl/projects/freebsd/ports/head/www/firefox/wor= k/firefox-68.0.2/media/mtransport/third_party/nICEr/src/stun/stun_client_c= tx.h:41: > In file included from = /home/root/obj/ports/home/tijl/projects/freebsd/ports/head/www/firefox/wor= k/firefox-68.0.2/media/mtransport/third_party/nICEr/src/stun/stun.h:45: > In file included from /usr/include/net/if_var.h:84: > /usr/include/sys/lock.h:68:15: error: reference to 'thread' is = ambiguous > struct thread **owner); > ^ > /usr/include/sys/lock.h:42:8: note: candidate found by name lookup is = 'thread' > struct thread; > ^ > /usr/include/c++/v1/__threading_support:397:24: note: candidate found = by name > lookup is 'std::__1::thread' > class _LIBCPP_TYPE_VIS thread; > ^ >=20 >=20 > This "class thread" conflicts with "struct thread" in sys/lock.h. > Should everything in sys/lock.h be under #ifdef _KERNEL? Maybe, but is Firefox using "using namespace std;" here? It is a likely explanation for the ambiguity between the global struct thread from sys/lock.h, and std::thread from libc++. -Dimitry --Apple-Mail=_CF6FB93D-1E70-4E41-974C-55A7A4FCF69D Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCXV1CLAAKCRCwXqMKLiCW ox00AJ94I76mMSoo1TroHaI8A6k+KaAz9wCfen99CTsq3xdljkYIPUC2ZtXpEEA= =3WIy -----END PGP SIGNATURE----- --Apple-Mail=_CF6FB93D-1E70-4E41-974C-55A7A4FCF69D--