svn commit: r351253 - in head/contrib/libc++: include src

[Dimitry Andric]

On 21 Aug 2019, at 14:49, Tijl Coosemans <tijl at FreeBSD.org> wrote:
> 
> On Tue, 20 Aug 2019 17:39:33 +0000 (UTC) Dimitry Andric
> <dim at FreeBSD.org> 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.
...
> 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?

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 223 bytes
Desc: Message signed with OpenPGP
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20190821/db47627f/attachment.sig>