From owner-svn-src-head@freebsd.org Wed Aug 21 15:52:41 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 462EDCC04C; Wed, 21 Aug 2019 15:52:41 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 46DBy07392z46XT; Wed, 21 Aug 2019 15:52:40 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id x7LFqVVi064194 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 21 Aug 2019 18:52:34 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua x7LFqVVi064194 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id x7LFqVQ7064193; Wed, 21 Aug 2019 18:52:31 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 21 Aug 2019 18:52:31 +0300 From: Konstantin Belousov To: =?utf-8?Q?T=C4=B3l?= Coosemans Cc: Dimitry Andric , 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: <20190821155231.GQ71821@kib.kiev.ua> References: <201908201739.x7KHdXvv054610@repo.freebsd.org> <20190821144908.7137e6bc@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190821144908.7137e6bc@FreeBSD.org> User-Agent: Mutt/1.12.1 (2019-06-15) X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on tom.home X-Rspamd-Queue-Id: 46DBy07392z46XT X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.90 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_SHORT(-0.90)[-0.901,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,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 15:52:41 -0000 On Wed, Aug 21, 2019 at 02:49:08PM +0200, Tijl Coosemans wrote: > 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? Why does firefox pulls if_var.h at all ? (As I understand, this is how the pollution occurs.)