From owner-svn-src-head@freebsd.org Wed Aug 21 12:49:13 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 282D9C7C26; Wed, 21 Aug 2019 12:49:13 +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 46D6tJ2JZ1z3QNy; Wed, 21 Aug 2019 12:49:11 +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?A2CjAgCJPF1d/ygG91FlHAEBAQQBAQc?= =?us-ascii?q?EAQGBVgQBAQsBghdZFFIyFhSNG4YBAYIONQGIBIIfkDUJAQECAQEBAQErDAE?= =?us-ascii?q?BhD8CglkmNwYOAgUBAQUBAgEBBgRthGVCDIVLAQU6HCMQCw4GBAklD0gGE4M?= =?us-ascii?q?jgg4Lq2iENAELAYEIg3eBCgaBNAGMAIF/hCM+hESFYwSURV2WMwmCH4ZojUU?= =?us-ascii?q?nmEaEHpEgkjkigVhNMAiDJ4JOF4hjhUE9AzCNJwEB?= X-IPAS-Result: =?us-ascii?q?A2CjAgCJPF1d/ygG91FlHAEBAQQBAQcEAQGBVgQBAQsBg?= =?us-ascii?q?hdZFFIyFhSNG4YBAYIONQGIBIIfkDUJAQECAQEBAQErDAEBhD8CglkmNwYOA?= =?us-ascii?q?gUBAQUBAgEBBgRthGVCDIVLAQU6HCMQCw4GBAklD0gGE4Mjgg4Lq2iENAELA?= =?us-ascii?q?YEIg3eBCgaBNAGMAIF/hCM+hESFYwSURV2WMwmCH4ZojUUnmEaEHpEgkjkig?= =?us-ascii?q?VhNMAiDJ4JOF4hjhUE9AzCNJwEB?= 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 14:49:09 +0200 Received: from localhost (localhost [127.0.0.1]) by kalimero.tijl.coosemans.org (8.15.2/8.15.2) with ESMTP id x7LCn8rn041401; Wed, 21 Aug 2019 14:49:08 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Wed, 21 Aug 2019 14:49:08 +0200 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Dimitry Andric Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r351253 - in head/contrib/libc++: include src Message-ID: <20190821144908.7137e6bc@FreeBSD.org> In-Reply-To: <201908201739.x7KHdXvv054610@repo.freebsd.org> References: <201908201739.x7KHdXvv054610@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 46D6tJ2JZ1z3QNy X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.991,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:5432, ipnet:195.238.0.0/19, country:BE]; NEURAL_HAM_LONG(-1.00)[-0.998,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 12:49:13 -0000 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 > > Log: > Pull in r368867 from upstream libc++ trunk (by Marshall Clow): > > 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 > > Pull in r368916 from upstream libc++ trunk (by Marshall Clow): > > Fix thread comparison by making sure we never pass our special 'not a > thread' value to the underlying implementation. Fixes PR#42918. > > This should fix std::thread::id::operator==() attempting to call > pthread_equal(3) with zero values. > > Reported by: andrew@tao11.riddles.org.uk > PR: 239038, 239550 > MFC after: 3 days > > Modified: > head/contrib/libc++/include/__threading_support > head/contrib/libc++/include/mutex > head/contrib/libc++/include/thread > head/contrib/libc++/src/mutex.cpp > > Modified: head/contrib/libc++/include/__threading_support > ============================================================================== > --- head/contrib/libc++/include/__threading_support Tue Aug 20 17:00:31 2019 (r351252) > +++ head/contrib/libc++/include/__threading_support Tue Aug 20 17:39:32 2019 (r351253) > @@ -13,6 +13,7 @@ > > #include <__config> > #include > +#include > #include > > #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER > @@ -392,6 +393,86 @@ int __libcpp_tls_set(__libcpp_tls_key __key, void *__p > } > > #endif // !_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL || _LIBCPP_BUILDING_THREAD_LIBRARY_EXTERNAL > + > +class _LIBCPP_TYPE_VIS thread; This seems to break building Firefox: In file included from /home/root/obj/ports/home/tijl/projects/freebsd/ports/head/www/firefox/work/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/work/firefox-68.0.2/media/mtransport/third_party/nICEr/src/stun/stun_client_ctx.h:41: In file included from /home/root/obj/ports/home/tijl/projects/freebsd/ports/head/www/firefox/work/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; ^ This "class thread" conflicts with "struct thread" in sys/lock.h. Should everything in sys/lock.h be under #ifdef _KERNEL?