Move stacktrace srcs out of experimental

Author: elsteveogrande

libcxx/docs/UserDocumentation.rst

@@ -70,7 +70,6 @@ when ``-fexperimental-library`` is passed:
 
 * The parallel algorithms library (``<execution>`` and the associated algorithms)
 * ``std::chrono::tzdb`` and related time zone functionality
-* ``<stacktrace>``
 * ``<syncstream>``
 
 .. note::

libcxx/include/__stacktrace/basic_stacktrace.h

@@ -7,11 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL_BASIC_STACKTRACE
-#define _LIBCPP_EXPERIMENTAL_BASIC_STACKTRACE
+#ifndef _LIBCPP_BASIC_STACKTRACE
+#define _LIBCPP_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>
@@ -303,4 +303,4 @@ struct _LIBCPP_EXPORTED_FROM_ABI hash<basic_stacktrace<_Allocator>> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP_EXPERIMENTAL_BASIC_STACKTRACE
+#endif // _LIBCPP_BASIC_STACKTRACE

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/__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/__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/__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

libcxx/include/__stacktrace/stacktrace_entry.h

@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE_ENTRY
-#define _LIBCPP_EXPERIMENTAL_STACKTRACE_ENTRY
+#ifndef _LIBCPP_STACKTRACE_ENTRY
+#define _LIBCPP_STACKTRACE_ENTRY
 
 #include <__cstddef/byte.h>
 #include <__cstddef/ptrdiff_t.h>
@@ -108,4 +108,4 @@ struct _LIBCPP_EXPORTED_FROM_ABI hash<stacktrace_entry> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_ENTRY
+#endif // _LIBCPP_STACKTRACE_ENTRY

libcxx/include/stacktrace

@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE
-#define _LIBCPP_EXPERIMENTAL_STACKTRACE
+#ifndef _LIBCPP_STACKTRACE
+#define _LIBCPP_STACKTRACE
 
 /*
   Header <stacktrace> synopsis
@@ -188,4 +188,4 @@ _LIBCPP_POP_MACROS
 #  endif // _LIBCPP_STD_VER >= 23
 #endif   // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 
-#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE
+#endif // _LIBCPP_STACKTRACE

libcxx/modules/std/stacktrace.inc

@@ -8,8 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 export namespace std {
-// TODO(stacktrace23): update this when stacktrace is taken out of experimental
-#if 0 //_LIBCPP_STD_VER >= 23
+#if _LIBCPP_STD_VER >= 23
 
   // [stacktrace.entry], class stacktrace_­entry
   using std::stacktrace_entry;

libcxx/src/CMakeLists.txt

@@ -40,6 +40,24 @@ set(LIBCXX_SOURCES
   ryu/d2fixed.cpp
   ryu/d2s.cpp
   ryu/f2s.cpp
+  stacktrace/alloc.cpp
+  stacktrace/common/debug.cpp
+  stacktrace/common/fd.cpp
+  stacktrace/context.cpp
+  stacktrace/linux/linux-dl.cpp
+  stacktrace/linux/linux-elf.cpp
+  stacktrace/linux/linux-sym.cpp
+  stacktrace/osx/osx.cpp
+  stacktrace/stacktrace.cpp
+  stacktrace/tools/addr2line.cpp
+  stacktrace/tools/atos.cpp
+  stacktrace/tools/llvm_symbolizer.cpp
+  stacktrace/tools/toolspawner.cpp
+  stacktrace/unwind/unwind.cpp
+  stacktrace/windows/dbghelp_dll.cpp
+  stacktrace/windows/dll.cpp
+  stacktrace/windows/psapi_dll.cpp
+  stacktrace/windows/win_impl.cpp
   stdexcept.cpp
   string.cpp
   support/runtime/exception_fallback.ipp
@@ -309,24 +327,6 @@ add_custom_target(cxx DEPENDS ${LIBCXX_BUILD_TARGETS})
 # Build the experimental static library
 set(LIBCXX_EXPERIMENTAL_SOURCES
   experimental/keep.cpp
-  experimental/stacktrace/alloc.cpp
-  experimental/stacktrace/common/debug.cpp
-  experimental/stacktrace/common/fd.cpp
-  experimental/stacktrace/context.cpp
-  experimental/stacktrace/linux/linux-dl.cpp
-  experimental/stacktrace/linux/linux-elf.cpp
-  experimental/stacktrace/linux/linux-sym.cpp
-  experimental/stacktrace/osx/osx.cpp
-  experimental/stacktrace/stacktrace.cpp
-  experimental/stacktrace/tools/addr2line.cpp
-  experimental/stacktrace/tools/atos.cpp
-  experimental/stacktrace/tools/llvm_symbolizer.cpp
-  experimental/stacktrace/tools/toolspawner.cpp
-  experimental/stacktrace/unwind/unwind.cpp
-  experimental/stacktrace/windows/dbghelp_dll.cpp
-  experimental/stacktrace/windows/dll.cpp
-  experimental/stacktrace/windows/psapi_dll.cpp
-  experimental/stacktrace/windows/win_impl.cpp
   )
 
 if (LIBCXX_PSTL_BACKEND STREQUAL "libdispatch")

libcxx/src/stacktrace/README.md

@@ -0,0 +1,5 @@
+# C++23 `<stacktrace>`
+
+# References
+
+1. https://eel.is/c++draft/stacktrace

libcxx/src/experimental/stacktrace/alloc.cpp renamed to libcxx/src/stacktrace/alloc.cpp

@@ -9,12 +9,12 @@
 #include <__config>
 #include <__config_site>
 
-#include <experimental/__stacktrace/detail/alloc.h>
+#include <__stacktrace/detail/alloc.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {
 
-void alloc::_anchor_vfunc() {}
+void alloc::~alloc() {}
 
 } // namespace __stacktrace
 _LIBCPP_END_NAMESPACE_STD

libcxx/src/experimental/stacktrace/common/config.h renamed to libcxx/src/stacktrace/common/config.h

@@ -11,13 +11,13 @@
 
 #include <list>
 
-#include <experimental/__stacktrace/basic_stacktrace.h>
-#include <experimental/__stacktrace/stacktrace_entry.h>
+#include <__stacktrace/basic_stacktrace.h>
+#include <__stacktrace/stacktrace_entry.h>
 
-#include <experimental/__stacktrace/detail/alloc.h>
-#include <experimental/__stacktrace/detail/context.h>
-#include <experimental/__stacktrace/detail/entry.h>
-#include <experimental/__stacktrace/detail/to_string.h>
+#include <__stacktrace/detail/alloc.h>
+#include <__stacktrace/detail/context.h>
+#include <__stacktrace/detail/entry.h>
+#include <__stacktrace/detail/to_string.h>
 
 #include "common/config.h"
 

libcxx/src/experimental/stacktrace/common/debug.cpp renamed to libcxx/src/stacktrace/common/debug.cpp

@@ -19,8 +19,8 @@
 
 #  include "../common/images.h"
 
-#  include <experimental/__stacktrace/detail/context.h>
-#  include <experimental/__stacktrace/detail/entry.h>
+#  include <__stacktrace/detail/context.h>
+#  include <__stacktrace/detail/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {

libcxx/src/experimental/stacktrace/common/debug.h renamed to libcxx/src/stacktrace/common/debug.h

@@ -15,8 +15,8 @@
 #  include <cassert>
 #  include <unistd.h>
 
-#  include <experimental/__stacktrace/detail/context.h>
-#  include <experimental/__stacktrace/detail/entry.h>
+#  include <__stacktrace/detail/context.h>
+#  include <__stacktrace/detail/entry.h>
 
 #  include "../common/fd.h"
 #  include "elf.h"

libcxx/src/experimental/stacktrace/common/failed.h renamed to libcxx/src/stacktrace/common/failed.h

@@ -16,8 +16,8 @@
 #  include <dlfcn.h>
 #  include <unistd.h>
 
-#  include <experimental/__stacktrace/detail/context.h>
-#  include <experimental/__stacktrace/detail/entry.h>
+#  include <__stacktrace/detail/context.h>
+#  include <__stacktrace/detail/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {

libcxx/src/experimental/stacktrace/common/fd.cpp renamed to libcxx/src/stacktrace/common/fd.cpp

@@ -16,8 +16,8 @@
 #  include <mach-o/dyld.h>
 #  include <mach-o/loader.h>
 
-#  include <experimental/__stacktrace/detail/context.h>
-#  include <experimental/__stacktrace/detail/entry.h>
+#  include <__stacktrace/detail/context.h>
+#  include <__stacktrace/detail/entry.h>
 
 #  include "osx.h"
 

libcxx/src/experimental/stacktrace/common/fd.h renamed to libcxx/src/stacktrace/common/fd.h

@@ -14,13 +14,13 @@
 #include <sstream>
 #include <string>
 
-#include <experimental/__stacktrace/basic_stacktrace.h>
-#include <experimental/__stacktrace/stacktrace_entry.h>
+#include <__stacktrace/basic_stacktrace.h>
+#include <__stacktrace/stacktrace_entry.h>
 
-#include <experimental/__stacktrace/detail/alloc.h>
-#include <experimental/__stacktrace/detail/context.h>
-#include <experimental/__stacktrace/detail/entry.h>
-#include <experimental/__stacktrace/detail/to_string.h>
+#include <__stacktrace/detail/alloc.h>
+#include <__stacktrace/detail/context.h>
+#include <__stacktrace/detail/entry.h>
+#include <__stacktrace/detail/to_string.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {

libcxx/src/experimental/stacktrace/common/images.h renamed to libcxx/src/stacktrace/common/images.h

@@ -13,8 +13,8 @@
 
 #include "tools.h"
 
-#include <experimental/__stacktrace/detail/context.h>
-#include <experimental/__stacktrace/detail/entry.h>
+#include <__stacktrace/detail/context.h>
+#include <__stacktrace/detail/entry.h>
 #include <string>
 
 _LIBCPP_BEGIN_NAMESPACE_STD

libcxx/src/experimental/stacktrace/context.cpp renamed to libcxx/src/stacktrace/context.cpp

@@ -15,9 +15,9 @@
 
 #include "tools.h"
 
-#include <experimental/__stacktrace/detail/alloc.h>
-#include <experimental/__stacktrace/detail/context.h>
-#include <experimental/__stacktrace/detail/entry.h>
+#include <__stacktrace/detail/alloc.h>
+#include <__stacktrace/detail/context.h>
+#include <__stacktrace/detail/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {

libcxx/src/experimental/stacktrace/linux/elf.h renamed to libcxx/src/stacktrace/linux/elf.h

@@ -15,8 +15,8 @@
 #include "../common/debug.h"
 #include "tools.h"
 
-#include <experimental/__stacktrace/detail/context.h>
-#include <experimental/__stacktrace/detail/entry.h>
+#include <__stacktrace/detail/context.h>
+#include <__stacktrace/detail/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {

libcxx/src/experimental/stacktrace/linux/linux-dl.cpp renamed to libcxx/src/stacktrace/linux/linux-dl.cpp

@@ -29,8 +29,8 @@
 #  include <unistd.h>
 #  include <vector>
 
-#  include <experimental/__stacktrace/detail/context.h>
-#  include <experimental/__stacktrace/detail/entry.h>
+#  include <__stacktrace/detail/context.h>
+#  include <__stacktrace/detail/entry.h>
 
 #  include "../common/debug.h"
 #  include "../common/failed.h"

libcxx/src/experimental/stacktrace/linux/linux-elf.cpp renamed to libcxx/src/stacktrace/linux/linux-elf.cpp

@@ -16,8 +16,8 @@
 #include <list>
 #include <string>
 
-#include <experimental/__stacktrace/detail/context.h>
-#include <experimental/__stacktrace/detail/entry.h>
+#include <__stacktrace/detail/context.h>
+#include <__stacktrace/detail/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {

libcxx/src/experimental/stacktrace/linux/linux-sym.cpp renamed to libcxx/src/stacktrace/linux/linux-sym.cpp

@@ -27,7 +27,7 @@
 #  include "../common/failed.h"
 #  include "pspawn.h"
 
-#  include <experimental/__stacktrace/detail/entry.h>
+#  include <__stacktrace/detail/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {

libcxx/src/experimental/stacktrace/linux/linux.h renamed to libcxx/src/stacktrace/linux/linux.h

@@ -12,8 +12,8 @@
 
 #  include "./unwind.h"
 
-#  include <experimental/__stacktrace/detail/context.h>
-#  include <experimental/__stacktrace/detail/entry.h>
+#  include <__stacktrace/detail/context.h>
+#  include <__stacktrace/detail/entry.h>
 #  include <unwind.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD

libcxx/src/experimental/stacktrace/osx/osx.cpp renamed to libcxx/src/stacktrace/osx/osx.cpp

@@ -21,7 +21,7 @@
 #  include <mutex>
 
 #  include "dll.h"
-#  include <experimental/__stacktrace/detail/entry.h>
+#  include <__stacktrace/detail/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {