[libc++] Define the __cpp_lib_atomic_ref feature test macro#98081
Merged
[libc++] Define the __cpp_lib_atomic_ref feature test macro#98081
Conversation
We forgot to enable it when we landed std::atomic_ref in 42ba740.
Member
|
@llvm/pr-subscribers-libcxx Author: Louis Dionne (ldionne) ChangesWe forgot to enable it when we landed std::atomic_ref in 42ba740. Full diff: https://github.com/llvm/llvm-project/pull/98081.diff 5 Files Affected:
diff --git a/libcxx/docs/FeatureTestMacroTable.rst b/libcxx/docs/FeatureTestMacroTable.rst
index 2eff42918886c..2a34aa4fe55cc 100644
--- a/libcxx/docs/FeatureTestMacroTable.rst
+++ b/libcxx/docs/FeatureTestMacroTable.rst
@@ -178,7 +178,7 @@ Status
---------------------------------------------------------- -----------------
``__cpp_lib_atomic_lock_free_type_aliases`` ``201907L``
---------------------------------------------------------- -----------------
- ``__cpp_lib_atomic_ref`` *unimplemented*
+ ``__cpp_lib_atomic_ref`` ``201806L``
---------------------------------------------------------- -----------------
``__cpp_lib_atomic_shared_ptr`` *unimplemented*
---------------------------------------------------------- -----------------
diff --git a/libcxx/include/version b/libcxx/include/version
index 460af8b6d396c..21231a4d4b0fc 100644
--- a/libcxx/include/version
+++ b/libcxx/include/version
@@ -366,7 +366,7 @@ __cpp_lib_void_t 201411L <type_traits>
# define __cpp_lib_atomic_flag_test 201907L
// # define __cpp_lib_atomic_float 201711L
# define __cpp_lib_atomic_lock_free_type_aliases 201907L
-// # define __cpp_lib_atomic_ref 201806L
+# define __cpp_lib_atomic_ref 201806L
// # define __cpp_lib_atomic_shared_ptr 201711L
# define __cpp_lib_atomic_value_initialization 201911L
# if _LIBCPP_AVAILABILITY_HAS_SYNC
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.compile.pass.cpp
index c907b7d840e30..9ed18fbfe19ac 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.compile.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.compile.pass.cpp
@@ -200,17 +200,11 @@
# error "__cpp_lib_atomic_min_max should not be defined before c++26"
# endif
-# if !defined(_LIBCPP_VERSION)
-# ifndef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should be defined in c++20"
-# endif
-# if __cpp_lib_atomic_ref != 201806L
-# error "__cpp_lib_atomic_ref should have the value 201806L in c++20"
-# endif
-# else // _LIBCPP_VERSION
-# ifdef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
-# endif
+# ifndef __cpp_lib_atomic_ref
+# error "__cpp_lib_atomic_ref should be defined in c++20"
+# endif
+# if __cpp_lib_atomic_ref != 201806L
+# error "__cpp_lib_atomic_ref should have the value 201806L in c++20"
# endif
# if !defined(_LIBCPP_VERSION)
@@ -299,17 +293,11 @@
# error "__cpp_lib_atomic_min_max should not be defined before c++26"
# endif
-# if !defined(_LIBCPP_VERSION)
-# ifndef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should be defined in c++23"
-# endif
-# if __cpp_lib_atomic_ref != 201806L
-# error "__cpp_lib_atomic_ref should have the value 201806L in c++23"
-# endif
-# else // _LIBCPP_VERSION
-# ifdef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
-# endif
+# ifndef __cpp_lib_atomic_ref
+# error "__cpp_lib_atomic_ref should be defined in c++23"
+# endif
+# if __cpp_lib_atomic_ref != 201806L
+# error "__cpp_lib_atomic_ref should have the value 201806L in c++23"
# endif
# if !defined(_LIBCPP_VERSION)
@@ -407,17 +395,11 @@
# endif
# endif
-# if !defined(_LIBCPP_VERSION)
-# ifndef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should be defined in c++26"
-# endif
-# if __cpp_lib_atomic_ref != 201806L
-# error "__cpp_lib_atomic_ref should have the value 201806L in c++26"
-# endif
-# else // _LIBCPP_VERSION
-# ifdef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
-# endif
+# ifndef __cpp_lib_atomic_ref
+# error "__cpp_lib_atomic_ref should be defined in c++26"
+# endif
+# if __cpp_lib_atomic_ref != 201806L
+# error "__cpp_lib_atomic_ref should have the value 201806L in c++26"
# endif
# if !defined(_LIBCPP_VERSION)
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp
index 9a5a10a8fb0f5..c0ffd78ebe3b1 100644
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp
@@ -3254,17 +3254,11 @@
# error "__cpp_lib_atomic_min_max should not be defined before c++26"
# endif
-# if !defined(_LIBCPP_VERSION)
-# ifndef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should be defined in c++20"
-# endif
-# if __cpp_lib_atomic_ref != 201806L
-# error "__cpp_lib_atomic_ref should have the value 201806L in c++20"
-# endif
-# else // _LIBCPP_VERSION
-# ifdef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
-# endif
+# ifndef __cpp_lib_atomic_ref
+# error "__cpp_lib_atomic_ref should be defined in c++20"
+# endif
+# if __cpp_lib_atomic_ref != 201806L
+# error "__cpp_lib_atomic_ref should have the value 201806L in c++20"
# endif
# if !defined(_LIBCPP_VERSION)
@@ -4675,17 +4669,11 @@
# error "__cpp_lib_atomic_min_max should not be defined before c++26"
# endif
-# if !defined(_LIBCPP_VERSION)
-# ifndef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should be defined in c++23"
-# endif
-# if __cpp_lib_atomic_ref != 201806L
-# error "__cpp_lib_atomic_ref should have the value 201806L in c++23"
-# endif
-# else // _LIBCPP_VERSION
-# ifdef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
-# endif
+# ifndef __cpp_lib_atomic_ref
+# error "__cpp_lib_atomic_ref should be defined in c++23"
+# endif
+# if __cpp_lib_atomic_ref != 201806L
+# error "__cpp_lib_atomic_ref should have the value 201806L in c++23"
# endif
# if !defined(_LIBCPP_VERSION)
@@ -6318,17 +6306,11 @@
# endif
# endif
-# if !defined(_LIBCPP_VERSION)
-# ifndef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should be defined in c++26"
-# endif
-# if __cpp_lib_atomic_ref != 201806L
-# error "__cpp_lib_atomic_ref should have the value 201806L in c++26"
-# endif
-# else // _LIBCPP_VERSION
-# ifdef __cpp_lib_atomic_ref
-# error "__cpp_lib_atomic_ref should not be defined because it is unimplemented in libc++!"
-# endif
+# ifndef __cpp_lib_atomic_ref
+# error "__cpp_lib_atomic_ref should be defined in c++26"
+# endif
+# if __cpp_lib_atomic_ref != 201806L
+# error "__cpp_lib_atomic_ref should have the value 201806L in c++26"
# endif
# if !defined(_LIBCPP_VERSION)
diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py
index d79892e140ebd..e92b6613b11a8 100755
--- a/libcxx/utils/generate_feature_test_macro_components.py
+++ b/libcxx/utils/generate_feature_test_macro_components.py
@@ -184,7 +184,6 @@ def add_version_header(tc):
"name": "__cpp_lib_atomic_ref",
"values": {"c++20": 201806},
"headers": ["atomic"],
- "unimplemented": True,
},
{
"name": "__cpp_lib_atomic_shared_ptr",
|
dalg24
approved these changes
Jul 8, 2024
Member
dalg24
left a comment
There was a problem hiding this comment.
You were faster than me :)
Thanks
Contributor
|
this has caused static asserts in some code expecting |
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 14, 2024
We forgot to enable it when we landed std::atomic_ref in 42ba740.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We forgot to enable it when we landed std::atomic_ref in 42ba740.