Implement the infrastructure for feature-test macros. Very few actual feature test macros, though. Reviewed as: https://reviews.llvm.org/D51955

llvm-svn: 342073

37 files changed, 49 insertions, 11 deletions

diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
index 55e1f9fc113..1359fda53b5 100644
--- a/libcxx/include/algorithm
+++ b/libcxx/include/algorithm
@@ -646,6 +646,7 @@ template <class BidirectionalIterator, class Compare>
 #include <iterator>
 #include <cstddef>
 #include <bit>
+#include <version>
 
 #include <__debug>
 
diff --git a/libcxx/include/any b/libcxx/include/any
index e6e0b6ea695..e2945bdfa98 100644
--- a/libcxx/include/any
+++ b/libcxx/include/any
@@ -87,6 +87,7 @@ namespace std {
 #include <typeinfo>
 #include <type_traits>
 #include <cstdlib>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/array b/libcxx/include/array
index ba4ff4260ed..8f4e111acbb 100644
--- a/libcxx/include/array
+++ b/libcxx/include/array
@@ -112,6 +112,7 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
 #include <algorithm>
 #include <stdexcept>
 #include <cstdlib> // for _LIBCPP_UNREACHABLE
+#include <version>
 #include <__debug>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/atomic b/libcxx/include/atomic
index 809f78a06d3..d37e7b4b035 100644
--- a/libcxx/include/atomic
+++ b/libcxx/include/atomic
@@ -544,6 +544,7 @@ void atomic_signal_fence(memory_order m) noexcept;
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
@@ -559,10 +560,6 @@ void atomic_signal_fence(memory_order m) noexcept;
 #error C++ standard library is incompatible with <stdatomic.h>
 #endif
 
-#if _LIBCPP_STD_VER > 14
-# define __cpp_lib_atomic_is_always_lock_free 201603L
-#endif
-
 #define _LIBCPP_CHECK_STORE_MEMORY_ORDER(__m) \
   _LIBCPP_DIAGNOSE_WARNING(__m == memory_order_consume || \
                            __m == memory_order_acquire || \
diff --git a/libcxx/include/bit b/libcxx/include/bit
index 5bf5214f330..db3812e5b5b 100644
--- a/libcxx/include/bit
+++ b/libcxx/include/bit
@@ -21,6 +21,7 @@ namespace std {
 */
 
 #include <__config>
+#include <version>
 
 #if defined(__IBMCPP__)
 #include "support/ibm/support.h"
diff --git a/libcxx/include/chrono b/libcxx/include/chrono
index b9709b37365..0691101010f 100644
--- a/libcxx/include/chrono
+++ b/libcxx/include/chrono
@@ -798,6 +798,7 @@ constexpr chrono::year                                  operator ""y(unsigned lo
 #include <type_traits>
 #include <ratio>
 #include <limits>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/cmath b/libcxx/include/cmath
index ffb1c46c7b6..f5f62adcfb8 100644
--- a/libcxx/include/cmath
+++ b/libcxx/include/cmath
@@ -303,6 +303,7 @@ long double    truncl(long double x);
 
 #include <__config>
 #include <math.h>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/complex b/libcxx/include/complex
index d692ee31920..8cf6a946d71 100644
--- a/libcxx/include/complex
+++ b/libcxx/include/complex
@@ -245,6 +245,7 @@ template<class T, class charT, class traits>
 #include <stdexcept>
 #include <cmath>
 #include <sstream>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/cstddef b/libcxx/include/cstddef
index b45dbe21df2..b4c42b19ddb 100644
--- a/libcxx/include/cstddef
+++ b/libcxx/include/cstddef
@@ -35,6 +35,7 @@ Types:
 */
 
 #include <__config>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/deque b/libcxx/include/deque
index bfbd3a5ef54..414c7a85972 100644
--- a/libcxx/include/deque
+++ b/libcxx/include/deque
@@ -161,6 +161,7 @@ template <class T, class Allocator>
 #include <iterator>
 #include <algorithm>
 #include <stdexcept>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/exception b/libcxx/include/exception
index b517486b5a8..7fd92798bff 100644
--- a/libcxx/include/exception
+++ b/libcxx/include/exception
@@ -81,6 +81,7 @@ template <class E> void rethrow_if_nested(const E& e);
 #include <cstddef>
 #include <cstdlib>
 #include <type_traits>
+#include <version>
 
 #if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME)
 #include <vcruntime_exception.h>
diff --git a/libcxx/include/filesystem b/libcxx/include/filesystem
index aa1d7180072..7547e6c5a69 100644
--- a/libcxx/include/filesystem
+++ b/libcxx/include/filesystem
@@ -244,6 +244,7 @@
 #include <utility>
 #include <iomanip> // for quoted
 #include <string_view>
+#include <version>
 
 #include <__debug>
 
@@ -256,10 +257,6 @@ _LIBCPP_PUSH_MACROS
 
 #ifndef _LIBCPP_CXX03_LANG
 
-#if _LIBCPP_STD_VER >= 17
-#define __cpp_lib_filesystem 201703
-#endif
-
 _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
 
 struct _FilesystemClock {
diff --git a/libcxx/include/forward_list b/libcxx/include/forward_list
index 571afdc925b..f9a71f0330a 100644
--- a/libcxx/include/forward_list
+++ b/libcxx/include/forward_list
@@ -177,6 +177,7 @@ template <class T, class Allocator>
 #include <limits>
 #include <iterator>
 #include <algorithm>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/functional b/libcxx/include/functional
index b91fd75421f..41beb404bb8 100644
--- a/libcxx/include/functional
+++ b/libcxx/include/functional
@@ -487,6 +487,7 @@ POLICY:  For non-variadic implementations, the number of arguments is limited
 #include <memory>
 #include <tuple>
 #include <utility>
+#include <version>
 
 #include <__functional_base>
 
@@ -2340,8 +2341,6 @@ bind(_Fp&& __f, _BoundArgs&&... __bound_args)
 
 #if _LIBCPP_STD_VER > 14
 
-#define __cpp_lib_invoke 201411
-
 template <class _Fn, class ..._Args>
 result_of_t<_Fn&&(_Args&&...)>
 invoke(_Fn&& __f, _Args&&... __args)
diff --git a/libcxx/include/iomanip b/libcxx/include/iomanip
index a6bee736f45..36c11167a44 100644
--- a/libcxx/include/iomanip
+++ b/libcxx/include/iomanip
@@ -46,6 +46,7 @@ template <class charT, class traits, class Allocator>
 #include <__config>
 #include <__string>
 #include <istream>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/iterator b/libcxx/include/iterator
index 9415e0b8396..aed0525dbf8 100644
--- a/libcxx/include/iterator
+++ b/libcxx/include/iterator
@@ -418,6 +418,7 @@ template <class E> constexpr const E* data(initializer_list<E> il) noexcept;
 #include <type_traits>
 #include <cstddef>
 #include <initializer_list>
+#include <version>
 #ifdef __APPLE__
 #include <Availability.h>
 #endif
diff --git a/libcxx/include/list b/libcxx/include/list
index 49e2e1e1b48..8f0e1db1fed 100644
--- a/libcxx/include/list
+++ b/libcxx/include/list
@@ -181,6 +181,7 @@ template <class T, class Alloc>
 #include <iterator>
 #include <algorithm>
 #include <type_traits>
+#include <version>
 
 #include <__debug>
 
diff --git a/libcxx/include/map b/libcxx/include/map
index 4700a09eda2..cfd82805870 100644
--- a/libcxx/include/map
+++ b/libcxx/include/map
@@ -460,6 +460,7 @@ swap(multimap<Key, T, Compare, Allocator>& x,
 #include <functional>
 #include <initializer_list>
 #include <type_traits>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/memory b/libcxx/include/memory
index de3f52d6ae4..276b3b763f8 100644
--- a/libcxx/include/memory
+++ b/libcxx/include/memory
@@ -667,6 +667,7 @@ void* align(size_t alignment, size_t size, void*& ptr, size_t& space);
 #if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)
 #  include <atomic>
 #endif
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/mutex b/libcxx/include/mutex
index 52e39b0fb1f..9c55c7cc164 100644
--- a/libcxx/include/mutex
+++ b/libcxx/include/mutex
@@ -194,6 +194,7 @@ template<class Callable, class ...Args>
 #ifndef _LIBCPP_CXX03_LANG
 #include <tuple>
 #endif
+#include <version>
 #include <__threading_support>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/new b/libcxx/include/new
index d27ff298221..8d72ba5c880 100644
--- a/libcxx/include/new
+++ b/libcxx/include/new
@@ -91,6 +91,7 @@ void  operator delete[](void* ptr, void*) noexcept;
 #include <exception>
 #include <type_traits>
 #include <cstddef>
+#include <version>
 #ifdef _LIBCPP_NO_EXCEPTIONS
 #include <cstdlib>
 #endif
diff --git a/libcxx/include/numeric b/libcxx/include/numeric
index 70ef173ea48..4e68239d059 100644
--- a/libcxx/include/numeric
+++ b/libcxx/include/numeric
@@ -142,6 +142,7 @@ template <class M, class N>
 #include <iterator>
 #include <limits> // for numeric_limits
 #include <functional>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/optional b/libcxx/include/optional
index a76f8d18976..9ef0aac3999 100644
--- a/libcxx/include/optional
+++ b/libcxx/include/optional
@@ -156,6 +156,7 @@ template<class T>
 #include <stdexcept>
 #include <type_traits>
 #include <utility>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/regex b/libcxx/include/regex
index dcdb14af9af..db15f78e410 100644
--- a/libcxx/include/regex
+++ b/libcxx/include/regex
@@ -769,6 +769,7 @@ typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
 #include <memory>
 #include <vector>
 #include <deque>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/scoped_allocator b/libcxx/include/scoped_allocator
index 4760d946def..bdbb0136b5c 100644
--- a/libcxx/include/scoped_allocator
+++ b/libcxx/include/scoped_allocator
@@ -108,6 +108,7 @@ template <class OuterA1, class OuterA2, class... InnerAllocs>
 
 #include <__config>
 #include <memory>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/set b/libcxx/include/set
index 108a9e97f88..f2ce6ea2f36 100644
--- a/libcxx/include/set
+++ b/libcxx/include/set
@@ -402,6 +402,7 @@ swap(multiset<Key, Compare, Allocator>& x, multiset<Key, Compare, Allocator>& y)
 #include <__tree>
 #include <__node_handle>
 #include <functional>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/shared_mutex b/libcxx/include/shared_mutex
index a7735d6732c..fbde0cf137a 100644
--- a/libcxx/include/shared_mutex
+++ b/libcxx/include/shared_mutex
@@ -124,6 +124,7 @@ template <class Mutex>
 */
 
 #include <__config>
+#include <version>
 
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
diff --git a/libcxx/include/string b/libcxx/include/string
index 162e54058c4..c79164cb232 100644
--- a/libcxx/include/string
+++ b/libcxx/include/string
@@ -510,6 +510,7 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len ); // C++1
 #include <type_traits>
 #include <initializer_list>
 #include <__functional_base>
+#include <version>
 #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
 #include <cstdint>
 #endif
diff --git a/libcxx/include/string_view b/libcxx/include/string_view
index 6377aeb6d64..55dce7271b4 100644
--- a/libcxx/include/string_view
+++ b/libcxx/include/string_view
@@ -178,6 +178,7 @@ namespace std {
 #include <iterator>
 #include <limits>
 #include <stdexcept>
+#include <version>
 #include <__debug>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/tuple b/libcxx/include/tuple
index b3a17e7b735..fb5428ec1c3 100644
--- a/libcxx/include/tuple
+++ b/libcxx/include/tuple
@@ -141,6 +141,7 @@ template <class... Types>
 #include <type_traits>
 #include <__functional_base>
 #include <utility>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits
index e413d2656e3..7ff67bfdb73 100644
--- a/libcxx/include/type_traits
+++ b/libcxx/include/type_traits
@@ -404,6 +404,7 @@ namespace std
 */
 #include <__config>
 #include <cstddef>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
@@ -4758,7 +4759,6 @@ struct __has_operator_addressof
 
 #if _LIBCPP_STD_VER > 14
 
-#define __cpp_lib_void_t 201411
 template <class...> using void_t = void;
 
 # ifndef _LIBCPP_HAS_NO_VARIADICS
diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map
index 348f57923b5..fc3cfb6a950 100644
--- a/libcxx/include/unordered_map
+++ b/libcxx/include/unordered_map
@@ -386,6 +386,7 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
 #include <functional>
 #include <stdexcept>
 #include <tuple>
+#include <version>
 
 #include <__debug>
 
diff --git a/libcxx/include/unordered_set b/libcxx/include/unordered_set
index 9b8560da494..a219fa60912 100644
--- a/libcxx/include/unordered_set
+++ b/libcxx/include/unordered_set
@@ -338,6 +338,7 @@ template <class Value, class Hash, class Pred, class Alloc>
 #include <__hash_table>
 #include <__node_handle>
 #include <functional>
+#include <version>
 
 #include <__debug>
 
diff --git a/libcxx/include/utility b/libcxx/include/utility
index ed9bf030d49..570ec05ae81 100644
--- a/libcxx/include/utility
+++ b/libcxx/include/utility
@@ -203,6 +203,7 @@ template <size_t I>
 #include <cstddef>
 #include <cstring>
 #include <cstdint>
+#include <version>
 #include <__debug>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/variant b/libcxx/include/variant
index 6c7dca21588..6a523569e20 100644
--- a/libcxx/include/variant
+++ b/libcxx/include/variant
@@ -208,6 +208,7 @@ namespace std {
 #include <type_traits>
 #include <utility>
 #include <limits>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/vector b/libcxx/include/vector
index 9245ba18ce9..e7aaa4df6c0 100644
--- a/libcxx/include/vector
+++ b/libcxx/include/vector
@@ -276,6 +276,7 @@ void swap(vector<T,Allocator>& x, vector<T,Allocator>& y)
 #include <stdexcept>
 #include <algorithm>
 #include <cstring>
+#include <version>
 #include <__split_buffer>
 #include <__functional_base>
 
diff --git a/libcxx/include/version b/libcxx/include/version
index 6d10411484e..80c27971f02 100644
--- a/libcxx/include/version
+++ b/libcxx/include/version
@@ -101,4 +101,17 @@ __cpp_lib_void_t                            201411L <type_traits>
 #pragma GCC system_header
 #endif
 
+#if _LIBCPP_STD_VER > 11
+#endif
+
+#if _LIBCPP_STD_VER > 14
+# define __cpp_lib_atomic_is_always_lock_free           201603L
+# define __cpp_lib_filesystem                           201703L
+# define __cpp_lib_invoke                               201411L
+# define __cpp_lib_void_t                               201411L
+#endif
+
+#if _LIBCPP_STD_VER > 17
+#endif
+
 #endif  // _LIBCPP_VERSIONH