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/CMakeLists.txt

@@ -728,10 +728,10 @@ set(files
   __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/alloc.h
+  __stacktrace/context.h
+  __stacktrace/entry.h
+  __stacktrace/to_string.h
   __stacktrace/stacktrace_entry.h
   __std_mbstate_t.h
   __stop_token/atomic_unique_lock.h

libcxx/include/__stacktrace/detail/alloc.h renamed to libcxx/include/__stacktrace/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>
@@ -29,7 +29,7 @@ namespace __stacktrace {
 /** Per-stacktrace-invocation allocator which wraps a caller-provided allocator of any type.
 This is intended to be used with `std::pmr::` containers and strings throughout the stacktrace
 creation process. */
-struct alloc final : std::pmr::memory_resource {
+struct _LIBCPP_HIDDEN alloc final : std::pmr::memory_resource {
   template <class _Allocator>
   _LIBCPP_HIDE_FROM_ABI explicit alloc(_Allocator const& __a) {
     // Take the given allocator type, and rebind with a new type having <byte> as the template arg
@@ -38,28 +38,22 @@ struct alloc final : std::pmr::memory_resource {
     auto __ba       = _BA(__a);
     __alloc_func_   = [__ba](size_t __sz) mutable { return __ba.allocate(__sz); };
     __dealloc_func_ = [__ba](void* __ptr, size_t __sz) mutable { return __ba.deallocate((std::byte*)__ptr, __sz); };
-    __alloc_opaque_ = std::addressof(__a);
+    __alloc_ptr     = std::addressof(__a);
   }
 
-  _LIBCPP_HIDE_FROM_ABI_VIRTUAL ~alloc() override = default;
+  _LIBCPP_HIDE_FROM_ABI ~alloc() override;
 
-  _LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual void _anchor_vfunc();
-
-  _LIBCPP_HIDE_FROM_ABI_VIRTUAL void* do_allocate(size_t __size, size_t __align) override {
-    // Avoiding "assert" in a system header, but we expect this to hold:
-    // assert(__align <= alignof(std::max_align_t));
-    (void)__align;
+  _LIBCPP_HIDE_FROM_ABI_VIRTUAL void* do_allocate(size_t __size, size_t /*__align*/) override {
     return __alloc_func_(__size);
   }
 
-  _LIBCPP_HIDE_FROM_ABI_VIRTUAL void do_deallocate(void* __ptr, size_t __size, size_t __align) override {
-    (void)__align;
+  _LIBCPP_HIDE_FROM_ABI_VIRTUAL void do_deallocate(void* __ptr, size_t __size, size_t /*__align*/) override {
     __dealloc_func_((std::byte*)__ptr, __size);
   }
 
   _LIBCPP_HIDE_FROM_ABI_VIRTUAL bool do_is_equal(std::pmr::memory_resource const& __rhs) const noexcept override {
     auto* __rhs_ba = dynamic_cast<alloc const*>(&__rhs);
-    return __rhs_ba && (__rhs_ba->__alloc_opaque_ == __alloc_opaque_);
+    return __rhs_ba && (__rhs_ba->__alloc_ptr == __alloc_ptr);
   }
 
   _LIBCPP_HIDE_FROM_ABI std::pmr::string new_string(size_t __size = 0) {
@@ -93,11 +87,11 @@ struct alloc final : std::pmr::memory_resource {
 private:
   std::function<std::byte*(size_t)> __alloc_func_;
   std::function<void(std::byte*, size_t)> __dealloc_func_;
-  /** Only used for equality */
-  void const* __alloc_opaque_;
+  /** Only used for checking equality */
+  void const* __alloc_ptr;
 };
 
 } // namespace __stacktrace
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_ALLOC
+#endif // _LIBCPP_STACKTRACE_ALLOC

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/entry.h>
+#include <__stacktrace/stacktrace_entry.h>
 
 #include <__config>
 #include <__format/formatter.h>
@@ -37,9 +37,9 @@
 #include <memory>
 #include <string>
 
-#include <__stacktrace/detail/alloc.h>
-#include <__stacktrace/detail/context.h>
-#include <__stacktrace/detail/to_string.h>
+#include <__stacktrace/alloc.h>
+#include <__stacktrace/context.h>
+#include <__stacktrace/to_string.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
@@ -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/context.h renamed to libcxx/include/__stacktrace/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,20 +18,20 @@
 #include <cstddef>
 #include <string>
 
-#include <experimental/__stacktrace/detail/alloc.h>
-#include <experimental/__stacktrace/detail/entry.h>
+#include <__stacktrace/alloc.h>
+#include <__stacktrace/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-struct _LIBCPP_HIDE_FROM_ABI alloc;
-struct _LIBCPP_HIDE_FROM_ABI entry;
+struct _LIBCPP_HIDDEN alloc;
+struct _LIBCPP_HIDDEN entry;
 
 namespace __stacktrace {
 
 /** Represents the state of the current in-progress stacktrace operation.  This includes
 the working list of `entry` objects, as well as the caller-provided allocator (wrapped
 in `polymorphic_allocator`) and a handful of utility functions involving that allocator. */
-struct _LIBCPP_HIDE_FROM_ABI context {
+struct _LIBCPP_HIDDEN context {
   /** Encapsulates and type-removes the caller's allocator. */
   alloc& __alloc_;
 
@@ -41,13 +41,13 @@ struct _LIBCPP_HIDE_FROM_ABI context {
   /** Path to this process's main executable. */
   std::pmr::string __main_prog_path_;
 
-  _LIBCPP_HIDE_FROM_ABI explicit context(alloc& __byte_alloc)
+  _LIBCPP_HIDDEN explicit context(alloc& __byte_alloc)
       : __alloc_(__byte_alloc), __entries_(&__alloc_), __main_prog_path_(__alloc_.new_string()) {}
 
-  _LIBCPP_NO_TAIL_CALLS _LIBCPP_NOINLINE void do_stacktrace(size_t __skip, size_t __max_depth);
+  _LIBCPP_NO_TAIL_CALLS _LIBCPP_NOINLINE _LIBCPP_HIDDEN void do_stacktrace(size_t __skip, size_t __max_depth);
 };
 
 } // namespace __stacktrace
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_CONTEXT
+#endif // _LIBCPP_STACKTRACE_CONTEXT

libcxx/include/__stacktrace/detail/entry.h renamed to libcxx/include/__stacktrace/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/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>
@@ -33,7 +33,7 @@
 #include <cstdint>
 #include <string>
 
-#include <__stacktrace/detail/entry.h>
+#include <__stacktrace/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
@@ -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/detail/to_string.h renamed to libcxx/include/__stacktrace/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/module.modulemap.in

@@ -1987,10 +1987,10 @@ module std [system] {
 
   module stacktrace {
     module basic_stacktrace { header "__stacktrace/basic_stacktrace.h" }
-    module alloc { header "__stacktrace/detail/alloc.h" }
-    module context { header "__stacktrace/detail/context.h" }
-    module entry { header "__stacktrace/detail/entry.h" }
-    module to_string { header "__stacktrace/detail/to_string.h" }
+    module alloc { header "__stacktrace/alloc.h" }
+    module context { header "__stacktrace/context.h" }
+    module entry { header "__stacktrace/entry.h" }
+    module to_string { header "__stacktrace/to_string.h" }
     module stacktrace_entry { header "__stacktrace/stacktrace_entry.h" }
     header "stacktrace"
     export *

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/alloc.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {
 
-void alloc::_anchor_vfunc() {}
+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/alloc.h>
+#include <__stacktrace/context.h>
+#include <__stacktrace/entry.h>
+#include <__stacktrace/to_string.h>
 
 #include "common/config.h"
 
@@ -44,7 +44,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {
 
-_LIBCPP_NO_TAIL_CALLS _LIBCPP_NOINLINE void context::do_stacktrace(size_t skip, size_t max_depth) {
+_LIBCPP_NO_TAIL_CALLS _LIBCPP_NOINLINE _LIBCPP_HIDDEN void context::do_stacktrace(size_t skip, size_t max_depth) {
   /*
   Here we declare stacktrace components or "backends" which will handle the different tasks:
 

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/context.h>
+#  include <__stacktrace/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {