[Bug libstdc++/121496] [14/15/16 Regression] 'class std::timed_mutex' has no member named '_M_clocklock' with -fsanitize=thread

[cvs-commit at gcc dot gnu.org via Gcc-bugs]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121496

--- Comment #7 from GCC Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jonathan Wakely <r...@gcc.gnu.org>:

https://gcc.gnu.org/g:d1dec304453fa4874d16daaa15e6f477435edda4

commit r16-3329-gd1dec304453fa4874d16daaa15e6f477435edda4
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Tue Aug 19 18:02:53 2025 +0100

    libstdc++: Check _GLIBCXX_USE_PTHREAD_MUTEX_CLOCKLOCK with #if [PR121496]

    The change in r14-905-g3b7cb33033fbe6 to disable the use of
    pthread_mutex_clocklock when TSan is active assumed that the
    _GLIBCXX_USE_PTHREAD_MUTEX_CLOCKLOCK macro was always checked with #if
    rather than #ifdef, which was not true.

    This makes the checks use #if consistently.

    libstdc++-v3/ChangeLog:

            PR libstdc++/121496
            * include/std/mutex (__timed_mutex_impl::_M_try_wait_until):
            Change preprocessor condition to use #if instead of #ifdef.
            (recursive_timed_mutex::_M_clocklock): Likewise.
            * testsuite/30_threads/timed_mutex/121496.cc: New test.

    Reviewed-by: Tomasz KamiÅski <tkami...@redhat.com>