This is an archive of the discontinued LLVM Phabricator instance.

Differential D118192

[libcxx] Allow using thread safety annotations in MinGW mode
ClosedPublic

Authored by mstorsjo on Jan 25 2022, 2:05 PM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rGde5d38ef2de6: [libcxx] Allow using thread safety annotations in MinGW mode
Summary

These were omitted in all Windows configurations, but it turns out
that they work just fine in MinGW mode.

This allows converting a couple cases of "XFAIL: LIBCXX-WINDOWS-FIXME"
into "XFAIL: msvc" as the bug is specific to MSVC mode (clang-cl).

Diff Detail

Event Timeline

mstorsjo requested review of this revision.Jan 25 2022, 2:05 PM
mstorsjo created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJan 25 2022, 2:05 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B145600: Diff 403035.Jan 25 2022, 5:16 PM
ldionne accepted this revision.Jan 27 2022, 2:00 PM
This revision is now accepted and ready to land.Jan 27 2022, 2:00 PM
Closed by commit rGde5d38ef2de6: [libcxx] Allow using thread safety annotations in MinGW mode (authored by mstorsjo). · Explain WhyJan 28 2022, 1:22 AM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rGde5d38ef2de6: [libcxx] Allow using thread safety annotations in MinGW mode.

Revision Contents

Diff 403922

libcxx/include/__config

Show First 20 Lines • Show All 1,252 Lines • ▼ Show 20 Lines
#ifndef _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK #ifndef _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
#define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK #define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
#endif #endif
#if defined(_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS) #if defined(_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS)
# if defined(__clang__) && __has_attribute(acquire_capability) # if defined(__clang__) && __has_attribute(acquire_capability)
// Work around the attribute handling in clang. When both __declspec and // Work around the attribute handling in clang. When both __declspec and
// __attribute__ are present, the processing goes awry preventing the definition // __attribute__ are present, the processing goes awry preventing the definition
// of the types. // of the types. In MinGW mode, __declspec evaluates to __attribute__, and thus
# if !defined(_LIBCPP_OBJECT_FORMAT_COFF) // combining the two does work.
# if !defined(_MSC_VER)
# define _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS # define _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS
# endif # endif
# endif # endif
#endif #endif
#ifdef _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS #ifdef _LIBCPP_HAS_THREAD_SAFETY_ANNOTATIONS
# define _LIBCPP_THREAD_SAFETY_ANNOTATION(x) __attribute__((x)) # define _LIBCPP_THREAD_SAFETY_ANNOTATION(x) __attribute__((x))
#else #else
▲ Show 20 Lines • Show All 166 Lines • Show Last 20 Lines

libcxx/test/libcxx/thread/thread.mutex/thread_safety_lock_guard.pass.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// On Windows Clang bugs out when both __declspec and __attribute__ are present, // On Windows Clang bugs out when both __declspec and __attribute__ are present,
// the processing goes awry preventing the definition of the types. // the processing goes awry preventing the definition of the types.
// XFAIL: LIBCXX-WINDOWS-FIXME // XFAIL: msvc
// UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: libcpp-has-no-threads
// REQUIRES: thread-safety // REQUIRES: thread-safety
// <mutex> // <mutex>
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS
Show All 21 Lines

libcxx/test/libcxx/thread/thread.mutex/thread_safety_lock_unlock.pass.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// On Windows Clang bugs out when both __declspec and __attribute__ are present, // On Windows Clang bugs out when both __declspec and __attribute__ are present,
// the processing goes awry preventing the definition of the types. // the processing goes awry preventing the definition of the types.
// XFAIL: LIBCXX-WINDOWS-FIXME // XFAIL: msvc
// UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: libcpp-has-no-threads
// REQUIRES: thread-safety // REQUIRES: thread-safety
// <mutex> // <mutex>
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS
Show All 14 Lines

libcxx/test/libcxx/thread/thread.mutex/thread_safety_missing_unlock.fail.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// On Windows Clang bugs out when both __declspec and __attribute__ are present, // On Windows Clang bugs out when both __declspec and __attribute__ are present,
// the processing goes awry preventing the definition of the types. // the processing goes awry preventing the definition of the types.
// XFAIL: LIBCXX-WINDOWS-FIXME // XFAIL: msvc
// UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: libcpp-has-no-threads
// REQUIRES: thread-safety // REQUIRES: thread-safety
// <mutex> // <mutex>
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS
Show All 9 Lines

libcxx/test/libcxx/thread/thread.mutex/thread_safety_requires_capability.pass.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// On Windows Clang bugs out when both __declspec and __attribute__ are present, // On Windows Clang bugs out when both __declspec and __attribute__ are present,
// the processing goes awry preventing the definition of the types. // the processing goes awry preventing the definition of the types.
// XFAIL: LIBCXX-WINDOWS-FIXME // XFAIL: msvc
// UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: libcpp-has-no-threads
// REQUIRES: thread-safety // REQUIRES: thread-safety
// <mutex> // <mutex>
// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS
Show All 18 Lines