From owner-svn-src-head@freebsd.org Wed Aug 21 13:20:06 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 6AA58C8794; Wed, 21 Aug 2019 13:20:06 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay109.isp.belgacom.be (mailrelay109.isp.belgacom.be [195.238.20.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "relay.skynet.be", Issuer "GlobalSign Organization Validation CA - SHA256 - G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46D7Yx6K45z3xLq; Wed, 21 Aug 2019 13:20:05 +0000 (UTC) (envelope-from tijl@freebsd.org) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DQCgC0RF1d/ygG91FlHAEBAQQBAQc?= =?us-ascii?q?EAQGBZ4IYWRRSMhYUhB+IfIYCAYIONQGIBIIfkDUJAQEBMQwBAYQ/AoJZJjg?= =?us-ascii?q?TAgUBAQUBAgEBBgRthGVCDIVLAQUjMyMQCw4GBAICBSECAg9IBhODI4IOC6o?= =?us-ascii?q?3gTKENAELAYUBgQoGgQwojAGBf4QjPoREgwuCWASURZcQCYIfhmiNRSeYRoQ?= =?us-ascii?q?ekSCSOiGBWE0wCIMni0iFQT0DMI0nAQE?= X-IPAS-Result: =?us-ascii?q?A2DQCgC0RF1d/ygG91FlHAEBAQQBAQcEAQGBZ4IYWRRSM?= =?us-ascii?q?hYUhB+IfIYCAYIONQGIBIIfkDUJAQEBMQwBAYQ/AoJZJjgTAgUBAQUBAgEBB?= =?us-ascii?q?gRthGVCDIVLAQUjMyMQCw4GBAICBSECAg9IBhODI4IOC6o3gTKENAELAYUBg?= =?us-ascii?q?QoGgQwojAGBf4QjPoREgwuCWASURZcQCYIfhmiNRSeYRoQekSCSOiGBWE0wC?= =?us-ascii?q?IMni0iFQT0DMI0nAQE?= Received: from 40.6-247-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.247.6.40]) by relay.skynet.be with ESMTP; 21 Aug 2019 15:20:05 +0200 Received: from localhost (localhost [127.0.0.1]) by kalimero.tijl.coosemans.org (8.15.2/8.15.2) with ESMTP id x7LDK3Pa041528; Wed, 21 Aug 2019 15:20:03 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Wed, 21 Aug 2019 15:20:03 +0200 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Dimitry Andric Cc: src-committers , svn-src-all , svn-src-head@freebsd.org, Marshall Clow Subject: Re: svn commit: r351253 - in head/contrib/libc++: include src Message-ID: <20190821151949.00c9845c@FreeBSD.org> In-Reply-To: References: <201908201739.x7KHdXvv054610@repo.freebsd.org> <20190821144908.7137e6bc@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 46D7Yx6K45z3xLq X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.94 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.989,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TAGGED_RCPT(0.00)[]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.95)[-0.949,0] 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:20:06 -0000 On Wed, 21 Aug 2019 15:07:56 +0200 Dimitry Andric wrote: > On 21 Aug 2019, at 14:49, T=C4=B3l Coosemans wrote: >> On Tue, 20 Aug 2019 17:39:33 +0000 (UTC) Dimitry Andric >> wrote: =20 >>> 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. =20 > ... >> This seems to break building Firefox: >>=20 >> In file included from /usr/ports/www/firefox/work/firefox-68.0.2/media/m= transport/nricectx.cpp:82: >> In file included from /usr/ports/www/firefox/work/firefox-68.0.2/media/m= transport/third_party/nICEr/src/stun/stun_client_ctx.h:41: >> In file included from /usr/ports/www/firefox/work/firefox-68.0.2/media/m= transport/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 't= hread' >> 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 >> This "class thread" conflicts with "struct thread" in sys/lock.h. >> Should everything in sys/lock.h be under #ifdef _KERNEL? =20 >=20 > 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++. Yes, several headers in media/mtransport/third_party/nICEr/src start with: #ifdef __cplusplus using namespace std; extern "C" { #endif /* __cplusplus */