Skip to content

Commit 05019eb

Browse files
EricWFEricWF
committed
Fix feature test macros for atomics/mutexes without threading
llvm-svn: 351291
1 parent d01a4aa commit 05019eb

File tree

5 files changed

+189
-77
lines changed

5 files changed

+189
-77
lines changed

‎libcxx/include/version‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ __cpp_lib_void_t 201411L <type_traits>
135135
# define __cpp_lib_quoted_string_io 201304L
136136
# define __cpp_lib_result_of_sfinae 201210L
137137
# define __cpp_lib_robust_nonmodifying_seq_ops 201304L
138-
# define __cpp_lib_shared_timed_mutex 201402L
138+
# if !defined(_LIBCPP_HAS_NO_THREADS)
139+
# define __cpp_lib_shared_timed_mutex 201402L
140+
# endif
139141
# define __cpp_lib_string_udls 201304L
140142
# define __cpp_lib_transformation_trait_aliases 201304L
141143
# define __cpp_lib_transparent_operators 201210L
@@ -152,7 +154,9 @@ __cpp_lib_void_t 201411L <type_traits>
152154
# define __cpp_lib_apply 201603L
153155
# define __cpp_lib_array_constexpr 201603L
154156
# define __cpp_lib_as_const 201510L
155-
# define __cpp_lib_atomic_is_always_lock_free 201603L
157+
# if !defined(_LIBCPP_HAS_NO_THREADS)
158+
# define __cpp_lib_atomic_is_always_lock_free 201603L
159+
# endif
156160
# define __cpp_lib_bool_constant 201505L
157161
// # define __cpp_lib_boyer_moore_searcher 201603L
158162
# define __cpp_lib_byte 201603L
@@ -188,7 +192,9 @@ __cpp_lib_void_t 201411L <type_traits>
188192
# define __cpp_lib_raw_memory_algorithms 201606L
189193
# define __cpp_lib_sample 201603L
190194
# define __cpp_lib_scoped_lock 201703L
191-
# define __cpp_lib_shared_mutex 201505L
195+
# if !defined(_LIBCPP_HAS_NO_THREADS)
196+
# define __cpp_lib_shared_mutex 201505L
197+
# endif
192198
// # define __cpp_lib_shared_ptr_arrays 201611L
193199
# define __cpp_lib_shared_ptr_weak_type 201606L
194200
# define __cpp_lib_string_view 201606L
@@ -203,7 +209,9 @@ __cpp_lib_void_t 201411L <type_traits>
203209
#endif
204210

205211
#if _LIBCPP_STD_VER > 17
206-
// # define __cpp_lib_atomic_ref 201806L
212+
# if !defined(_LIBCPP_HAS_NO_THREADS)
213+
// # define __cpp_lib_atomic_ref 201806L
214+
# endif
207215
// # define __cpp_lib_bind_front 201811L
208216
// # define __cpp_lib_bit_cast 201806L
209217
# if !defined(_LIBCPP_NO_HAS_CHAR8_T)

‎libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
// WARNING: This test was generated by generate_feature_test_macros_tests.py and
1111
// should not be edited manually.
1212

13+
// UNSUPPORTED: libcpp-has-no-threads
14+
1315
// <atomic>
1416

1517
// Test the feature test macros defined by <atomic>
@@ -53,11 +55,17 @@
5355

5456
#elif TEST_STD_VER == 17
5557

56-
# ifndef __cpp_lib_atomic_is_always_lock_free
57-
# error "__cpp_lib_atomic_is_always_lock_free should be defined in c++17"
58-
# endif
59-
# if __cpp_lib_atomic_is_always_lock_free != 201603L
60-
# error "__cpp_lib_atomic_is_always_lock_free should have the value 201603L in c++17"
58+
# if !defined(_LIBCPP_HAS_NO_THREADS)
59+
# ifndef __cpp_lib_atomic_is_always_lock_free
60+
# error "__cpp_lib_atomic_is_always_lock_free should be defined in c++17"
61+
# endif
62+
# if __cpp_lib_atomic_is_always_lock_free != 201603L
63+
# error "__cpp_lib_atomic_is_always_lock_free should have the value 201603L in c++17"
64+
# endif
65+
# else
66+
# ifdef __cpp_lib_atomic_is_always_lock_free
67+
# error "__cpp_lib_atomic_is_always_lock_free should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!"
68+
# endif
6169
# endif
6270

6371
# ifdef __cpp_lib_atomic_ref
@@ -70,11 +78,17 @@
7078

7179
#elif TEST_STD_VER > 17
7280

73-
# ifndef __cpp_lib_atomic_is_always_lock_free
74-
# error "__cpp_lib_atomic_is_always_lock_free should be defined in c++2a"
75-
# endif
76-
# if __cpp_lib_atomic_is_always_lock_free != 201603L
77-
# error "__cpp_lib_atomic_is_always_lock_free should have the value 201603L in c++2a"
81+
# if !defined(_LIBCPP_HAS_NO_THREADS)
82+
# ifndef __cpp_lib_atomic_is_always_lock_free
83+
# error "__cpp_lib_atomic_is_always_lock_free should be defined in c++2a"
84+
# endif
85+
# if __cpp_lib_atomic_is_always_lock_free != 201603L
86+
# error "__cpp_lib_atomic_is_always_lock_free should have the value 201603L in c++2a"
87+
# endif
88+
# else
89+
# ifdef __cpp_lib_atomic_is_always_lock_free
90+
# error "__cpp_lib_atomic_is_always_lock_free should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!"
91+
# endif
7892
# endif
7993

8094
# if !defined(_LIBCPP_VERSION)

‎libcxx/test/std/language.support/support.limits/support.limits.general/generate_feature_test_macro_components.py‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,18 @@ def add_version_header(tc):
148148
"values": {
149149
"c++14": 201402L,
150150
},
151-
"headers": ["shared_mutex"]
151+
"headers": ["shared_mutex"],
152+
"depends": "!defined(_LIBCPP_HAS_NO_THREADS)",
153+
"internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)",
152154
},
153155
# C++17 macros
154156
{"name": "__cpp_lib_atomic_is_always_lock_free",
155157
"values": {
156158
"c++17": 201603L,
157159
},
158-
"headers": ["atomic"]
160+
"headers": ["atomic"],
161+
"depends": "!defined(_LIBCPP_HAS_NO_THREADS)",
162+
"internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)",
159163
},
160164
{"name": "__cpp_lib_filesystem",
161165
"values": {
@@ -446,6 +450,8 @@ def add_version_header(tc):
446450
"c++17": 201505L,
447451
},
448452
"headers": ["shared_mutex"],
453+
"depends": "!defined(_LIBCPP_HAS_NO_THREADS)",
454+
"internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)",
449455
},
450456
{"name": "__cpp_lib_scoped_lock",
451457
"values": {
@@ -553,6 +559,8 @@ def add_version_header(tc):
553559
},
554560
"headers": ["atomic"],
555561
"unimplemented": True,
562+
"depends": "!defined(_LIBCPP_HAS_NO_THREADS)",
563+
"internal_depends": "!defined(_LIBCPP_HAS_NO_THREADS)",
556564
},
557565
]], key=lambda tc: tc["name"])
558566

@@ -802,6 +810,10 @@ def mk_line(prefix, suffix):
802810
result += "*/"
803811
return result
804812

813+
def is_threading_header_unsafe_to_include(h):
814+
# NOTE: "<mutex>" does not blow up when included without threads.
815+
return h in ['atomic', 'shared_mutex']
816+
805817
def produce_tests():
806818
headers = set([h for tc in feature_test_macros for h in tc["headers"]])
807819
for h in headers:
@@ -810,6 +822,9 @@ def produce_tests():
810822
for tc in test_list:
811823
assert 'unimplemented' in tc.keys()
812824
continue
825+
test_tags = ""
826+
if is_threading_header_unsafe_to_include(h):
827+
test_tags += '\n// UNSUPPORTED: libcpp-has-no-threads\n'
813828
test_body = \
814829
"""//===----------------------------------------------------------------------===//
815830
//
@@ -822,7 +837,7 @@ def produce_tests():
822837
//
823838
// WARNING: This test was generated by generate_feature_test_macros_tests.py and
824839
// should not be edited manually.
825-
840+
{test_tags}
826841
// <{header}>
827842
828843
// Test the feature test macros defined by <{header}>
@@ -852,6 +867,7 @@ def produce_tests():
852867
853868
int main() {{}}
854869
""".format(header=h,
870+
test_tags=test_tags,
855871
synopsis=generate_synopsis(test_list),
856872
cxx11_tests=generate_std_test(test_list, 'c++11').strip(),
857873
cxx14_tests=generate_std_test(test_list, 'c++14').strip(),

‎libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp‎

Lines changed: 57 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
// WARNING: This test was generated by generate_feature_test_macros_tests.py and
1111
// should not be edited manually.
1212

13+
// UNSUPPORTED: libcpp-has-no-threads
14+
1315
// <shared_mutex>
1416

1517
// Test the feature test macros defined by <shared_mutex>
@@ -38,43 +40,73 @@
3840
# error "__cpp_lib_shared_mutex should not be defined before c++17"
3941
# endif
4042

41-
# ifndef __cpp_lib_shared_timed_mutex
42-
# error "__cpp_lib_shared_timed_mutex should be defined in c++14"
43-
# endif
44-
# if __cpp_lib_shared_timed_mutex != 201402L
45-
# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++14"
43+
# if !defined(_LIBCPP_HAS_NO_THREADS)
44+
# ifndef __cpp_lib_shared_timed_mutex
45+
# error "__cpp_lib_shared_timed_mutex should be defined in c++14"
46+
# endif
47+
# if __cpp_lib_shared_timed_mutex != 201402L
48+
# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++14"
49+
# endif
50+
# else
51+
# ifdef __cpp_lib_shared_timed_mutex
52+
# error "__cpp_lib_shared_timed_mutex should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!"
53+
# endif
4654
# endif
4755

4856
#elif TEST_STD_VER == 17
4957

50-
# ifndef __cpp_lib_shared_mutex
51-
# error "__cpp_lib_shared_mutex should be defined in c++17"
52-
# endif
53-
# if __cpp_lib_shared_mutex != 201505L
54-
# error "__cpp_lib_shared_mutex should have the value 201505L in c++17"
58+
# if !defined(_LIBCPP_HAS_NO_THREADS)
59+
# ifndef __cpp_lib_shared_mutex
60+
# error "__cpp_lib_shared_mutex should be defined in c++17"
61+
# endif
62+
# if __cpp_lib_shared_mutex != 201505L
63+
# error "__cpp_lib_shared_mutex should have the value 201505L in c++17"
64+
# endif
65+
# else
66+
# ifdef __cpp_lib_shared_mutex
67+
# error "__cpp_lib_shared_mutex should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!"
68+
# endif
5569
# endif
5670

57-
# ifndef __cpp_lib_shared_timed_mutex
58-
# error "__cpp_lib_shared_timed_mutex should be defined in c++17"
59-
# endif
60-
# if __cpp_lib_shared_timed_mutex != 201402L
61-
# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++17"
71+
# if !defined(_LIBCPP_HAS_NO_THREADS)
72+
# ifndef __cpp_lib_shared_timed_mutex
73+
# error "__cpp_lib_shared_timed_mutex should be defined in c++17"
74+
# endif
75+
# if __cpp_lib_shared_timed_mutex != 201402L
76+
# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++17"
77+
# endif
78+
# else
79+
# ifdef __cpp_lib_shared_timed_mutex
80+
# error "__cpp_lib_shared_timed_mutex should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!"
81+
# endif
6282
# endif
6383

6484
#elif TEST_STD_VER > 17
6585

66-
# ifndef __cpp_lib_shared_mutex
67-
# error "__cpp_lib_shared_mutex should be defined in c++2a"
68-
# endif
69-
# if __cpp_lib_shared_mutex != 201505L
70-
# error "__cpp_lib_shared_mutex should have the value 201505L in c++2a"
86+
# if !defined(_LIBCPP_HAS_NO_THREADS)
87+
# ifndef __cpp_lib_shared_mutex
88+
# error "__cpp_lib_shared_mutex should be defined in c++2a"
89+
# endif
90+
# if __cpp_lib_shared_mutex != 201505L
91+
# error "__cpp_lib_shared_mutex should have the value 201505L in c++2a"
92+
# endif
93+
# else
94+
# ifdef __cpp_lib_shared_mutex
95+
# error "__cpp_lib_shared_mutex should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!"
96+
# endif
7197
# endif
7298

73-
# ifndef __cpp_lib_shared_timed_mutex
74-
# error "__cpp_lib_shared_timed_mutex should be defined in c++2a"
75-
# endif
76-
# if __cpp_lib_shared_timed_mutex != 201402L
77-
# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++2a"
99+
# if !defined(_LIBCPP_HAS_NO_THREADS)
100+
# ifndef __cpp_lib_shared_timed_mutex
101+
# error "__cpp_lib_shared_timed_mutex should be defined in c++2a"
102+
# endif
103+
# if __cpp_lib_shared_timed_mutex != 201402L
104+
# error "__cpp_lib_shared_timed_mutex should have the value 201402L in c++2a"
105+
# endif
106+
# else
107+
# ifdef __cpp_lib_shared_timed_mutex
108+
# error "__cpp_lib_shared_timed_mutex should not be defined when !defined(_LIBCPP_HAS_NO_THREADS) is not defined!"
109+
# endif
78110
# endif
79111

80112
#endif // TEST_STD_VER > 17

0 commit comments

Comments
 (0)