Move stacktrace files out of experimental; fix feature macros

Author: elsteveogrande

libcxx/CMakeLists.txt

@@ -132,8 +132,8 @@ option(LIBCXX_ENABLE_VENDOR_AVAILABILITY_ANNOTATIONS
    for more details." OFF)
 
 option(LIBCPP_STACKTRACE_ALLOW_TOOLS_AT_RUNTIME
-   "For C++23 <stacktrace>: whether to allow invocation of `addr2line`, `llvm-addr2line` or `atos`
-   at runtime (if it's available in PATH) to resolve call-chain addresses in the stacktrace
+   "For C++23 <stacktrace>: whether to allow invocation of `addr2line`, `llvm-addr2line`, or `atos`
+   at runtime (if one is available in PATH) to resolve call-chain addresses in the stacktrace
    into source locations, if other methods are not available." ON)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

libcxx/docs/FeatureTestMacroTable.rst

@@ -392,7 +392,7 @@ Status
     ---------------------------------------------------------- -----------------
     ``__cpp_lib_spanstream``                                   *unimplemented*
     ---------------------------------------------------------- -----------------
-    ``__cpp_lib_stacktrace``                                   *unimplemented*
+    ``__cpp_lib_stacktrace``                                   ``202011L``
     ---------------------------------------------------------- -----------------
     ``__cpp_lib_stdatomic_h``                                  ``202011L``
     ---------------------------------------------------------- -----------------

libcxx/docs/VendorDocumentation.rst

@@ -189,8 +189,8 @@ General purpose options
 
    **Default**: ``OFF``
 
-   For C++23 <stacktrace>: whether to allow invocation of ``addr2line`` or ``llvm-addr2line``
-   at runtime (if it's available in PATH) to resolve call-chain addresses in the stacktrace
+   For C++23 <stacktrace>: whether to allow invocation of ``llvm-symbolizer``, ``addr2line``, or ``atos``
+   at runtime (if one is available in PATH) to resolve call-chain addresses in the stacktrace
    into source locations, if other methods are not available.
 
 .. option:: LIBCXX_INSTALL_LIBRARY_DIR:PATH

libcxx/include/CMakeLists.txt

@@ -727,6 +727,12 @@ set(files
   __ranges/views.h
   __ranges/zip_view.h
   __split_buffer
+  __stacktrace/basic_stacktrace.h
+  __stacktrace/detail/alloc.h
+  __stacktrace/detail/context.h
+  __stacktrace/detail/entry.h
+  __stacktrace/detail/to_string.h
+  __stacktrace/stacktrace_entry.h
   __std_mbstate_t.h
   __stop_token/atomic_unique_lock.h
   __stop_token/intrusive_list_view.h
@@ -991,17 +997,10 @@ set(files
   experimental/__simd/traits.h
   experimental/__simd/utility.h
   experimental/__simd/vec_ext.h
-  experimental/__stacktrace/basic_stacktrace.h
-  experimental/__stacktrace/detail/alloc.h
-  experimental/__stacktrace/detail/context.h
-  experimental/__stacktrace/detail/entry.h
-  experimental/__stacktrace/detail/to_string.h
-  experimental/__stacktrace/stacktrace_entry.h
   experimental/iterator
   experimental/memory
   experimental/propagate_const
   experimental/simd
-  experimental/stacktrace
   experimental/type_traits
   experimental/utility
   ext/__hash
@@ -1054,6 +1053,7 @@ set(files
   span
   sstream
   stack
+  stacktrace
   stdatomic.h
   stdbool.h
   stddef.h

libcxx/include/__cxx03/version

@@ -495,7 +495,7 @@ __cpp_lib_void_t                                        201411L <type_traits>
 // # define __cpp_lib_ranges_zip                           202110L
 // # define __cpp_lib_reference_from_temporary             202202L
 // # define __cpp_lib_spanstream                           202106L
-// # define __cpp_lib_stacktrace                           202011L
+# define __cpp_lib_stacktrace                           202011L
 # define __cpp_lib_stdatomic_h                          202011L
 # define __cpp_lib_string_contains                      202011L
 # define __cpp_lib_string_resize_and_overwrite          202110L

libcxx/include/experimental/__stacktrace/basic_stacktrace.h renamed to libcxx/include/__stacktrace/basic_stacktrace.h

@@ -10,8 +10,8 @@
 #ifndef _LIBCPP_EXPERIMENTAL_BASIC_STACKTRACE
 #define _LIBCPP_EXPERIMENTAL_BASIC_STACKTRACE
 
-#include <experimental/__stacktrace/detail/entry.h>
-#include <experimental/__stacktrace/stacktrace_entry.h>
+#include <__stacktrace/detail/entry.h>
+#include <__stacktrace/stacktrace_entry.h>
 
 #include <__config>
 #include <__format/formatter.h>
@@ -37,9 +37,9 @@
 #include <memory>
 #include <string>
 
-#include <experimental/__stacktrace/detail/alloc.h>
-#include <experimental/__stacktrace/detail/context.h>
-#include <experimental/__stacktrace/detail/to_string.h>
+#include <__stacktrace/detail/alloc.h>
+#include <__stacktrace/detail/context.h>
+#include <__stacktrace/detail/to_string.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 

libcxx/include/experimental/__stacktrace/detail/alloc.h renamed to libcxx/include/__stacktrace/detail/alloc.h

@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE_ALLOC
-#define _LIBCPP_EXPERIMENTAL_STACKTRACE_ALLOC
+#ifndef _LIBCPP_STACKTRACE_ALLOC
+#define _LIBCPP_STACKTRACE_ALLOC
 
 #include <__config>
 #include <__functional/function.h>
@@ -100,4 +100,4 @@ struct alloc final : std::pmr::memory_resource {
 } // namespace __stacktrace
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_ALLOC
+#endif // _LIBCPP_STACKTRACE_ALLOC

libcxx/include/experimental/__stacktrace/detail/context.h renamed to libcxx/include/__stacktrace/detail/context.h

@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE_CONTEXT
-#define _LIBCPP_EXPERIMENTAL_STACKTRACE_CONTEXT
+#ifndef _LIBCPP_STACKTRACE_CONTEXT
+#define _LIBCPP_STACKTRACE_CONTEXT
 
 #include <__config>
 #include <__memory_resource/memory_resource.h>
@@ -18,8 +18,8 @@
 #include <cstddef>
 #include <string>
 
-#include <experimental/__stacktrace/detail/alloc.h>
-#include <experimental/__stacktrace/detail/entry.h>
+#include <__stacktrace/detail/alloc.h>
+#include <__stacktrace/detail/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
@@ -50,4 +50,4 @@ struct _LIBCPP_HIDE_FROM_ABI context {
 } // namespace __stacktrace
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_CONTEXT
+#endif // _LIBCPP_STACKTRACE_CONTEXT

libcxx/include/experimental/__stacktrace/detail/entry.h renamed to libcxx/include/__stacktrace/detail/entry.h

@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE_DETAIL_ENTRY
-#define _LIBCPP_EXPERIMENTAL_STACKTRACE_DETAIL_ENTRY
+#ifndef _LIBCPP_STACKTRACE_DETAIL_ENTRY
+#define _LIBCPP_STACKTRACE_DETAIL_ENTRY
 
 #include <__config>
 #include <cstdint>
@@ -41,4 +41,4 @@ struct _LIBCPP_HIDE_FROM_ABI entry {
 } // namespace __stacktrace
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_DETAIL_ENTRY
+#endif // _LIBCPP_STACKTRACE_DETAIL_ENTRY

libcxx/include/experimental/__stacktrace/detail/to_string.h renamed to libcxx/include/__stacktrace/detail/to_string.h

@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE_TO_STRING
-#define _LIBCPP_EXPERIMENTAL_STACKTRACE_TO_STRING
+#ifndef _LIBCPP_STACKTRACE_TO_STRING
+#define _LIBCPP_STACKTRACE_TO_STRING
 
 #include <__config>
 #include <__fwd/sstream.h>
@@ -43,4 +43,4 @@ struct _LIBCPP_HIDE_FROM_ABI __to_string {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_TO_STRING
+#endif // _LIBCPP_STACKTRACE_TO_STRING