[clang] 5421057 - [Clang][NFC] Add feature test macro checks for C++2c
Corentin Jabot via cfe-commits
cfe-commits at lists.llvm.org
Sun Jun 25 01:28:25 PDT 2023
Author: Corentin Jabot
Date: 2023-06-25T10:27:42+02:00
New Revision: 54210573ae918f6e0cab59bc5955a66bc34b5f6c
URL: https://github.com/llvm/llvm-project/commit/54210573ae918f6e0cab59bc5955a66bc34b5f6c
DIFF: https://github.com/llvm/llvm-project/commit/54210573ae918f6e0cab59bc5955a66bc34b5f6c.diff
LOG: [Clang][NFC] Add feature test macro checks for C++2c
Added:
Modified:
clang/test/Lexer/cxx-features.cpp
Removed:
################################################################################
diff --git a/clang/test/Lexer/cxx-features.cpp b/clang/test/Lexer/cxx-features.cpp
index 6d4cb25044c62..1b6c793e1defb 100644
--- a/clang/test/Lexer/cxx-features.cpp
+++ b/clang/test/Lexer/cxx-features.cpp
@@ -4,6 +4,8 @@
// RUN: %clang_cc1 -std=c++17 -fcxx-exceptions -fsized-deallocation -verify %s
// RUN: %clang_cc1 -std=c++20 -fcxx-exceptions -fsized-deallocation -verify %s
// RUN: %clang_cc1 -std=c++23 -fcxx-exceptions -fsized-deallocation -verify %s
+// RUN: %clang_cc1 -std=c++2c -fcxx-exceptions -fsized-deallocation -verify %s
+
//
// RUN: %clang_cc1 -std=c++17 -fcxx-exceptions -fsized-deallocation -frelaxed-template-template-args -DRELAXED_TEMPLATE_TEMPLATE_ARGS=1 -verify %s
// RUN: %clang_cc1 -std=c++17 -fcxx-exceptions -fsized-deallocation -DCONCEPTS_TS=1 -verify %s
@@ -15,151 +17,155 @@
// FIXME using `defined` in a macro has undefined behavior.
#if __cplusplus < 201103L
-#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23) (cxx98 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx98)
+#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23, cxx26) (cxx98 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx98)
#elif __cplusplus < 201402L
-#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23) (cxx11 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx11)
+#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23, cxx26) (cxx11 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx11)
#elif __cplusplus < 201703L
-#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23) (cxx14 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx14)
+#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23, cxx26) (cxx14 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx14)
#elif __cplusplus < 202002L
-#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23) (cxx17 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx17)
-#elif __cplusplus == 202002L
-#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23) (cxx20 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx20)
+#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23, cxx26) (cxx17 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx17)
+#elif __cplusplus < 202302L
+#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23, cxx26) (cxx20 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx20)
+#elif __cplusplus == 202302L
+#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23, cxx26) (cxx23 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx23)
#else
-#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23) (cxx23 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx23)
+#define check(macro, cxx98, cxx11, cxx14, cxx17, cxx20, cxx23, cxx26) (cxx26 == 0 ? defined(__cpp_##macro) : __cpp_##macro != cxx26)
#endif
+// --- C++26 features ---
+
// --- C++23 features ---
-#if check(implicit_move, 0, 0, 0, 0, 0, 202011)
+#if check(implicit_move, 0, 0, 0, 0, 0, 202011, 202011)
#error "wrong value for __cpp_implicit_move"
#endif
-#if check(size_t_suffix, 0, 0, 0, 0, 0, 202011)
+#if check(size_t_suffix, 0, 0, 0, 0, 0, 202011, 202011)
#error "wrong value for __cpp_size_t_suffix"
#endif
-#if check(if_consteval, 0, 0, 0, 0, 0, 202106)
+#if check(if_consteval, 0, 0, 0, 0, 0, 202106, 202106)
#error "wrong value for __cpp_if_consteval"
#endif
-#if check(multidimensional_subscript, 0, 0, 0, 0, 0, 202211)
+#if check(multidimensional_subscript, 0, 0, 0, 0, 0, 202211, 202211)
#error "wrong value for __cpp_multidimensional_subscript"
#endif
-#if check(static_call_operator, 0, 202207, 202207, 202207, 202207, 202207)
+#if check(static_call_operator, 0, 202207, 202207, 202207, 202207, 202207, 202207)
#error "wrong value for __cpp_static_call_operator"
#endif
-#if check(named_character_escapes, 202207, 202207, 202207, 202207, 202207, 202207)
+#if check(named_character_escapes, 202207, 202207, 202207, 202207, 202207, 202207, 202207)
#error "wrong value for __cpp_named_character_escapes"
#endif
-#if check(explicit_this_parameter, 0, 0, 0, 0, 0, 0)
+#if check(explicit_this_parameter, 0, 0, 0, 0, 0, 0, 0)
#error "wrong value for __cpp_explicit_this_parameter"
#endif
// --- C++20 features ---
-#if check(aggregate_paren_init, 0, 0, 0, 0, 201902, 201902)
+#if check(aggregate_paren_init, 0, 0, 0, 0, 201902, 201902, 201902)
#error "wrong value for __cpp_aggregate_paren_init"
#endif
-#if defined(CHAR8_T) ? check(char8_t, 202207, 202207, 202207, 202207, 202207, 202207) : \
- defined(NO_CHAR8_T) ? check(char8_t, 0, 0, 0, 0, 0, 0) : \
- check(char8_t, 0, 0, 0, 0, 202207, 202207)
+#if defined(CHAR8_T) ? check(char8_t, 202207, 202207, 202207, 202207, 202207, 202207, 202207) : \
+ defined(NO_CHAR8_T) ? check(char8_t, 0, 0, 0, 0, 0, 0, 0) : \
+ check(char8_t, 0, 0, 0, 0, 202207, 202207, 202207)
#error "wrong value for __cpp_char8_t"
#endif
-#if check(concepts, 0, 0, 0, 0, 201907, 201907)
+#if check(concepts, 0, 0, 0, 0, 201907, 201907, 201907)
#error "wrong value for __cpp_concepts"
#endif
-#if check(conditional_explicit, 0, 0, 0, 0, 201806, 201806)
+#if check(conditional_explicit, 0, 0, 0, 0, 201806, 201806, 201806)
#error "wrong value for __cpp_conditional_explicit"
#endif
-#if check(consteval, 0, 0, 0, 0, 202211, 202211)
+#if check(consteval, 0, 0, 0, 0, 202211, 202211, 202211)
#error "wrong value for __cpp_consteval"
#endif
// constexpr checked below
-#if check(constexpr_dynamic_alloc, 0, 0, 0, 0, 201907, 201907)
+#if check(constexpr_dynamic_alloc, 0, 0, 0, 0, 201907, 201907, 201907)
#error "wrong value for __cpp_constexpr_dynamic_alloc"
#endif
-#if check(constexpr_in_decltype, 0, 201711, 201711, 201711, 201711, 201711)
+#if check(constexpr_in_decltype, 0, 201711, 201711, 201711, 201711, 201711, 201711)
#error "wrong value for __cpp_constexpr_in_decltype"
#endif
-#if check(constinit, 0, 0, 0, 0, 201907, 201907)
+#if check(constinit, 0, 0, 0, 0, 201907, 201907, 201907)
#error "wrong value for __cpp_constinit"
#endif
// deduction_guides checked below
-#if check(designated_initializers, 0, 0, 0, 0, 201707, 201707)
+#if check(designated_initializers, 0, 0, 0, 0, 201707, 201707, 201707)
#error "wrong value for __cpp_designated_initializers"
#endif
// generic_lambdas checked below
-#if check(impl_destroying_delete, 201806, 201806, 201806, 201806, 201806, 201806)
+#if check(impl_destroying_delete, 201806, 201806, 201806, 201806, 201806, 201806, 201806)
#error "wrong value for __cpp_impl_destroying_delete"
#endif
-#if check(impl_three_way_comparison, 0, 0, 0, 0, 201907, 201907)
+#if check(impl_three_way_comparison, 0, 0, 0, 0, 201907, 201907, 201907)
#error "wrong value for __cpp_impl_three_way_comparison"
#endif
-#if check(impl_coroutine, 0, 0, 0, 0, 201902L, 201902L)
+#if check(impl_coroutine, 0, 0, 0, 0, 201902L, 201902L, 201902L)
#error "wrong value for __cpp_impl_coroutine"
#endif
// init_captures checked below
-#if check(modules, 0, 0, 0, 0, 0, 0)
+#if check(modules, 0, 0, 0, 0, 0, 0, 0)
// FIXME: 201907 in C++20
#error "wrong value for __cpp_modules"
#endif
-#if check(using_enum, 0, 0, 0, 0, 201907, 201907)
+#if check(using_enum, 0, 0, 0, 0, 201907, 201907, 201907)
#error "wrong value for __cpp_using_enum"
#endif
// --- C++17 features ---
-#if check(hex_float, 0, 0, 0, 201603, 201603, 201603)
+#if check(hex_float, 0, 0, 0, 201603, 201603, 201603, 201603)
#error "wrong value for __cpp_hex_float"
#endif
-#if check(inline_variables, 0, 0, 0, 201606, 201606, 201606)
+#if check(inline_variables, 0, 0, 0, 201606, 201606, 201606, 201606)
#error "wrong value for __cpp_inline_variables"
#endif
-#if check(aligned_new, 0, 0, 0, 201606, 201606, 201606)
+#if check(aligned_new, 0, 0, 0, 201606, 201606, 201606, 201606)
#error "wrong value for __cpp_aligned_new"
#endif
-#if check(guaranteed_copy_elision, 0, 0, 0, 201606, 201606, 201606)
+#if check(guaranteed_copy_elision, 0, 0, 0, 201606, 201606, 201606, 201606)
#error "wrong value for __cpp_guaranteed_copy_elision"
#endif
-#if check(noexcept_function_type, 0, 0, 0, 201510, 201510, 201510)
+#if check(noexcept_function_type, 0, 0, 0, 201510, 201510, 201510, 201510)
#error "wrong value for __cpp_noexcept_function_type"
#endif
-#if check(fold_expressions, 0, 0, 0, 201603, 201603, 201603)
+#if check(fold_expressions, 0, 0, 0, 201603, 201603, 201603, 201603)
#error "wrong value for __cpp_fold_expressions"
#endif
-#if check(capture_star_this, 0, 0, 0, 201603, 201603, 201603)
+#if check(capture_star_this, 0, 0, 0, 201603, 201603, 201603, 201603)
#error "wrong value for __cpp_capture_star_this"
#endif
// constexpr checked below
-#if check(if_constexpr, 0, 0, 0, 201606, 201606, 201606)
+#if check(if_constexpr, 0, 0, 0, 201606, 201606, 201606, 201606)
#error "wrong value for __cpp_if_constexpr"
#endif
@@ -167,191 +173,193 @@
// static_assert checked below
-#if check(deduction_guides, 0, 0, 0, 201703, 201703, 201703)
+#if check(deduction_guides, 0, 0, 0, 201703, 201703, 201703, 201703)
// FIXME: 201907 in C++20
#error "wrong value for __cpp_deduction_guides"
#endif
-#if check(nontype_template_parameter_auto, 0, 0, 0, 201606, 201606, 201606)
+#if check(nontype_template_parameter_auto, 0, 0, 0, 201606, 201606, 201606, 201606)
#error "wrong value for __cpp_nontype_template_parameter_auto"
#endif
// This is the old name (from P0096R4) for
// __cpp_nontype_template_parameter_auto
-#if check(template_auto, 0, 0, 0, 201606, 201606, 201606)
+#if check(template_auto, 0, 0, 0, 201606, 201606, 201606, 201606)
#error "wrong value for __cpp_template_auto"
#endif
-#if check(namespace_attributes, 0, 0, 0, 201411, 201411, 201411)
+#if check(namespace_attributes, 0, 0, 0, 201411, 201411, 201411, 201411)
// FIXME: allowed without warning in C++14 and C++11
#error "wrong value for __cpp_namespace_attributes"
#endif
-#if check(enumerator_attributes, 0, 0, 0, 201411, 201411, 201411)
+#if check(enumerator_attributes, 0, 0, 0, 201411, 201411, 201411, 201411)
// FIXME: allowed without warning in C++14 and C++11
#error "wrong value for __cpp_enumerator_attributes"
#endif
// This is an old name (from P0096R4), now removed from SD-6.
-#if check(nested_namespace_definitions, 0, 0, 0, 201411, 201411, 201411)
+#if check(nested_namespace_definitions, 0, 0, 0, 201411, 201411, 201411, 201411)
#error "wrong value for __cpp_nested_namespace_definitions"
#endif
// inheriting_constructors checked below
-#if check(variadic_using, 0, 0, 0, 201611, 201611, 201611)
+#if check(variadic_using, 0, 0, 0, 201611, 201611, 201611, 201611)
#error "wrong value for __cpp_variadic_using"
#endif
-#if check(aggregate_bases, 0, 0, 0, 201603, 201603, 201603)
+#if check(aggregate_bases, 0, 0, 0, 201603, 201603, 201603, 201603)
#error "wrong value for __cpp_aggregate_bases"
#endif
-#if check(structured_bindings, 0, 0, 0, 201606, 201606, 201606)
+#if check(structured_bindings, 0, 0, 0, 201606, 201606, 201606, 201606)
#error "wrong value for __cpp_structured_bindings"
#endif
-#if check(nontype_template_args, 0, 0, 0, 201411, 201411, 201411)
+#if check(nontype_template_args, 0, 0, 0, 201411, 201411, 201411, 201411)
// FIXME: 201911 in C++20
#error "wrong value for __cpp_nontype_template_args"
#endif
#if defined(RELAXED_TEMPLATE_TEMPLATE_ARGS) \
- ? check(template_template_args, 0, 0, 0, 201611, 201611, 201611) \
- : check(template_template_args, 0, 0, 0, 0, 0, 0)
+ ? check(template_template_args, 0, 0, 0, 201611, 201611, 201611, 201611) \
+ : check(template_template_args, 0, 0, 0, 0, 0, 0, 0)
#error "wrong value for __cpp_template_template_args"
#endif
// --- C++14 features ---
-#if check(binary_literals, 0, 0, 201304, 201304, 201304, 201304)
+#if check(binary_literals, 0, 0, 201304, 201304, 201304, 201304, 201304)
#error "wrong value for __cpp_binary_literals"
#endif
// (Removed from SD-6.)
-#if check(digit_separators, 0, 0, 201309, 201309, 201309, 201309)
+#if check(digit_separators, 0, 0, 201309, 201309, 201309, 201309, 201309)
#error "wrong value for __cpp_digit_separators"
#endif
-#if check(init_captures, 0, 0, 201304, 201304, 201803, 201803)
+#if check(init_captures, 0, 0, 201304, 201304, 201803, 201803, 201803)
#error "wrong value for __cpp_init_captures"
#endif
-#if check(generic_lambdas, 0, 0, 201304, 201304, 201707, 201707)
+#if check(generic_lambdas, 0, 0, 201304, 201304, 201707, 201707, 201707)
#error "wrong value for __cpp_generic_lambdas"
#endif
-#if check(sized_deallocation, 0, 0, 201309, 201309, 201309, 201309)
+#if check(sized_deallocation, 0, 0, 201309, 201309, 201309, 201309, 201309)
#error "wrong value for __cpp_sized_deallocation"
#endif
// constexpr checked below
-#if check(decltype_auto, 0, 0, 201304, 201304, 201304, 201304)
+#if check(decltype_auto, 0, 0, 201304, 201304, 201304, 201304, 201304)
#error "wrong value for __cpp_decltype_auto"
#endif
-#if check(return_type_deduction, 0, 0, 201304, 201304, 201304, 201304)
+#if check(return_type_deduction, 0, 0, 201304, 201304, 201304, 201304, 201304)
#error "wrong value for __cpp_return_type_deduction"
#endif
-#if check(runtime_arrays, 0, 0, 0, 0, 0, 0)
+#if check(runtime_arrays, 0, 0, 0, 0, 0, 0, 0)
#error "wrong value for __cpp_runtime_arrays"
#endif
-#if check(aggregate_nsdmi, 0, 0, 201304, 201304, 201304, 201304)
+#if check(aggregate_nsdmi, 0, 0, 201304, 201304, 201304, 201304, 201304)
#error "wrong value for __cpp_aggregate_nsdmi"
#endif
-#if check(variable_templates, 0, 0, 201304, 201304, 201304, 201304)
+#if check(variable_templates, 0, 0, 201304, 201304, 201304, 201304, 201304)
#error "wrong value for __cpp_variable_templates"
#endif
// --- C++11 features ---
-#if check(unicode_characters, 0, 200704, 200704, 200704, 200704, 200704)
+#if check(unicode_characters, 0, 200704, 200704, 200704, 200704, 200704, 200704)
#error "wrong value for __cpp_unicode_characters"
#endif
-#if check(raw_strings, 0, 200710, 200710, 200710, 200710, 200710)
+#if check(raw_strings, 0, 200710, 200710, 200710, 200710, 200710, 200710)
#error "wrong value for __cpp_raw_strings"
#endif
-#if check(unicode_literals, 0, 200710, 200710, 200710, 200710, 200710)
+#if check(unicode_literals, 0, 200710, 200710, 200710, 200710, 200710, 200710)
#error "wrong value for __cpp_unicode_literals"
#endif
-#if check(user_defined_literals, 0, 200809, 200809, 200809, 200809, 200809)
+#if check(user_defined_literals, 0, 200809, 200809, 200809, 200809, 200809, 200809)
#error "wrong value for __cpp_user_defined_literals"
#endif
-#if defined(NO_THREADSAFE_STATICS) ? check(threadsafe_static_init, 0, 0, 0, 0, 0, 0) : \
- check(threadsafe_static_init, 200806, 200806, 200806, 200806, 200806, 200806)
+#if defined(NO_THREADSAFE_STATICS) ? check(threadsafe_static_init, 0, 0, 0, 0, 0, 0, 0) : \
+ check(threadsafe_static_init, 200806, 200806, 200806, 200806, 200806, 200806, 200806)
#error "wrong value for __cpp_threadsafe_static_init"
#endif
-#if check(lambdas, 0, 200907, 200907, 200907, 200907, 200907)
+#if check(lambdas, 0, 200907, 200907, 200907, 200907, 200907, 200907)
#error "wrong value for __cpp_lambdas"
#endif
-#if check(constexpr, 0, 200704, 201304, 201603, 201907, 202211)
+#if check(constexpr, 0, 200704, 201304, 201603, 201907, 202211, 202211)
#error "wrong value for __cpp_constexpr"
#endif
-#if check(range_based_for, 0, 200907, 200907, 201603, 201603, 201603)
+#if check(range_based_for, 0, 200907, 200907, 201603, 201603, 201603, 201603)
#error "wrong value for __cpp_range_based_for"
#endif
-#if check(static_assert, 0, 200410, 200410, 201411, 201411, 201411)
+#if check(static_assert, 0, 200410, 200410, 201411, 201411, 201411, 201411)
#error "wrong value for __cpp_static_assert"
#endif
-#if check(decltype, 0, 200707, 200707, 200707, 200707, 200707)
+#if check(decltype, 0, 200707, 200707, 200707, 200707, 200707, 200707)
#error "wrong value for __cpp_decltype"
#endif
-#if check(attributes, 0, 200809, 200809, 200809, 200809, 200809)
+#if check(attributes, 0, 200809, 200809, 200809, 200809, 200809, 200809)
#error "wrong value for __cpp_attributes"
#endif
-#if check(rvalue_references, 0, 200610, 200610, 200610, 200610, 200610)
+#if check(rvalue_references, 0, 200610, 200610, 200610, 200610, 200610, 200610)
#error "wrong value for __cpp_rvalue_references"
#endif
-#if check(variadic_templates, 0, 200704, 200704, 200704, 200704, 200704)
+#if check(variadic_templates, 0, 200704, 200704, 200704, 200704, 200704, 200704)
#error "wrong value for __cpp_variadic_templates"
#endif
-#if check(initializer_lists, 0, 200806, 200806, 200806, 200806, 200806)
+#if check(initializer_lists, 0, 200806, 200806, 200806, 200806, 200806, 200806)
#error "wrong value for __cpp_initializer_lists"
#endif
-#if check(delegating_constructors, 0, 200604, 200604, 200604, 200604, 200604)
+#if check(delegating_constructors, 0, 200604, 200604, 200604, 200604, 200604, 200604)
#error "wrong value for __cpp_delegating_constructors"
#endif
-#if check(nsdmi, 0, 200809, 200809, 200809, 200809, 200809)
+#if check(nsdmi, 0, 200809, 200809, 200809, 200809, 200809, 200809)
#error "wrong value for __cpp_nsdmi"
#endif
-#if check(inheriting_constructors, 0, 201511, 201511, 201511, 201511, 201511)
+#if check(inheriting_constructors, 0, 201511, 201511, 201511, 201511, 201511, 201511)
#error "wrong value for __cpp_inheriting_constructors"
#endif
-#if check(ref_qualifiers, 0, 200710, 200710, 200710, 200710, 200710)
+#if check(ref_qualifiers, 0, 200710, 200710, 200710, 200710, 200710, 200710)
#error "wrong value for __cpp_ref_qualifiers"
#endif
-#if check(alias_templates, 0, 200704, 200704, 200704, 200704, 200704)
+#if check(alias_templates, 0, 200704, 200704, 200704, 200704, 200704, 200704)
#error "wrong value for __cpp_alias_templates"
#endif
// --- C++98 features ---
-#if defined(NO_RTTI) ? check(rtti, 0, 0, 0, 0, 0, 0) : check(rtti, 199711, 199711, 199711, 199711, 199711, 199711)
+#if defined(NO_RTTI) ? check(rtti, 0, 0, 0, 0, 0, 0, 0 ) \
+ : check(rtti, 199711, 199711, 199711, 199711, 199711, 199711, 199711)
#error "wrong value for __cpp_rtti"
#endif
-#if defined(NO_EXCEPTIONS) ? check(exceptions, 0, 0, 0, 0, 0, 0) : check(exceptions, 199711, 199711, 199711, 199711, 199711, 199711)
+#if defined(NO_EXCEPTIONS) ? check(exceptions, 0, 0, 0, 0, 0, 0, 0) \
+ : check(exceptions, 199711, 199711, 199711, 199711, 199711, 199711, 199711)
#error "wrong value for __cpp_exceptions"
#endif
More information about the cfe-commits
mailing list