Move stacktrace headers out of experimental

elsteveogrande · elsteveogrande · commit 316e17cad2cd · 2025-04-23T15:15:22.000-04:00
diff --git a/libcxx/include/CMakeLists.txt b/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
diff --git a/libcxx/include/__stacktrace/basic_stacktrace.h b/libcxx/include/__stacktrace/basic_stacktrace.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
 
diff --git a/libcxx/include/__stacktrace/detail/alloc.h b/libcxx/include/__stacktrace/detail/alloc.h
diff --git a/libcxx/include/__stacktrace/detail/context.h b/libcxx/include/__stacktrace/detail/context.h
diff --git a/libcxx/include/__stacktrace/detail/entry.h b/libcxx/include/__stacktrace/detail/entry.h
diff --git a/libcxx/include/__stacktrace/detail/to_string.h b/libcxx/include/__stacktrace/detail/to_string.h
diff --git a/libcxx/include/__stacktrace/stacktrace_entry.h b/libcxx/include/__stacktrace/stacktrace_entry.h
@@ -33,7 +33,7 @@
 #include <cstdint>
 #include <string>
 
-#include "experimental/__stacktrace/detail/entry.h"
+#include <__stacktrace/detail/entry.h>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
diff --git a/libcxx/include/module.modulemap.in b/libcxx/include/module.modulemap.in
@@ -1985,6 +1985,17 @@ module std [system] {
     export *
   }
 
+  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 stacktrace_entry { header "__stacktrace/stacktrace_entry.h" }
+    header "stacktrace"
+    export *
+  }
+
   module stdexcept {
     header "stdexcept"
     export *
@@ -2225,16 +2236,6 @@ module std [system] {
       header "experimental/simd"
       export *
     }
-    module stacktrace {
-      private header "experimental/__stacktrace/basic_stacktrace.h"
-      private header "experimental/__stacktrace/detail/alloc.h"
-      private header "experimental/__stacktrace/detail/context.h"
-      private header "experimental/__stacktrace/detail/entry.h"
-      private header "experimental/__stacktrace/detail/to_string.h"
-      private header "experimental/__stacktrace/stacktrace_entry.h"
-      header "experimental/stacktrace"
-      export *
-    }
   }
 
   // Implementation detail headers that are private to libc++. These modules
diff --git a/libcxx/include/stacktrace b/libcxx/include/stacktrace
@@ -180,8 +180,8 @@ namespace std {
 _LIBCPP_PUSH_MACROS
 #    include <__undef_macros>
 
-#    include "experimental/__stacktrace/basic_stacktrace.h"
-#    include "experimental/__stacktrace/stacktrace_entry.h"
+#    include <__stacktrace/basic_stacktrace.h>
+#    include <__stacktrace/stacktrace_entry.h>
 
 _LIBCPP_POP_MACROS
 
diff --git a/libcxx/modules/std.compat.cppm.in b/libcxx/modules/std.compat.cppm.in
@@ -71,9 +71,6 @@ module;
 #  if __has_include(<spanstream>)
 #    error "please update the header information for <spanstream> in headers_not_available in utils/libcxx/header_information.py"
 #  endif // __has_include(<spanstream>)
-#  if __has_include(<stacktrace>)
-#    error "please update the header information for <stacktrace> in headers_not_available in utils/libcxx/header_information.py"
-#  endif // __has_include(<stacktrace>)
 #  if __has_include(<stdfloat>)
 #    error "please update the header information for <stdfloat> in headers_not_available in utils/libcxx/header_information.py"
 #  endif // __has_include(<stdfloat>)
@@ -86,4 +83,4 @@ export module std.compat;
 export import std;
 
 
-@LIBCXX_MODULE_STD_COMPAT_INCLUDE_SOURCES@
+@LIBCXX_MODULE_STD_COMPAT_INCLUDE_SOURCES@
diff --git a/libcxx/modules/std.cppm.in b/libcxx/modules/std.cppm.in
@@ -181,9 +181,6 @@ module;
 #  if __has_include(<spanstream>)
 #    error "please update the header information for <spanstream> in headers_not_available in utils/libcxx/header_information.py"
 #  endif // __has_include(<spanstream>)
-#  if __has_include(<stacktrace>)
-#    error "please update the header information for <stacktrace> in headers_not_available in utils/libcxx/header_information.py"
-#  endif // __has_include(<stacktrace>)
 #  if __has_include(<stdfloat>)
 #    error "please update the header information for <stdfloat> in headers_not_available in utils/libcxx/header_information.py"
 #  endif // __has_include(<stdfloat>)
diff --git a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
@@ -167,6 +167,38 @@ cxx_sources = [
   "ryu/d2s.cpp",
   "ryu/f2s.cpp",
   "shared_mutex.cpp",
+  # "stacktrace/alloc.cpp",
+  # "stacktrace/common/config.h",
+  # "stacktrace/common/debug.cpp",
+  # "stacktrace/common/debug.h",
+  # "stacktrace/common/failed.h",
+  # "stacktrace/common/fd.cpp",
+  # "stacktrace/common/fd.h",
+  # "stacktrace/common/images.h",
+  # "stacktrace/context.cpp",
+  # "stacktrace/linux/linux-dl.cpp",
+  # "stacktrace/linux/linux-elf.cpp",
+  # "stacktrace/linux/linux-sym.cpp",
+  # "stacktrace/linux/linux.h",
+  # "stacktrace/osx/osx.cpp",
+  # "stacktrace/osx/osx.h",
+  # "stacktrace/stacktrace.cpp",
+  # "stacktrace/tools/addr2line.cpp",
+  # "stacktrace/tools/atos.cpp",
+  # "stacktrace/tools/llvm_symbolizer.cpp",
+  # "stacktrace/tools/pspawn.h",
+  # "stacktrace/tools/tools.h",
+  # "stacktrace/tools/toolspawner.cpp",
+  # "stacktrace/unwind/unwind.cpp",
+  # "stacktrace/unwind/unwind.h",
+  # "stacktrace/windows/dbghelp_dll.cpp",
+  # "stacktrace/windows/dbghelp_dll.h",
+  # "stacktrace/windows/dll.cpp",
+  # "stacktrace/windows/dll.h",
+  # "stacktrace/windows/psapi_dll.cpp",
+  # "stacktrace/windows/psapi_dll.h",
+  # "stacktrace/windows/win_impl.cpp",
+  # "stacktrace/windows/win_impl.h",
   "stdexcept.cpp",
   "string.cpp",
   "strstream.cpp",
@@ -317,40 +349,6 @@ if (libcxx_enable_experimental) {
     output_dir = runtimes_dir
     output_name = "c++experimental"
     sources = [ "experimental/keep.cpp" ]
-    sources += [
-      "experimental/stacktrace/alloc.cpp",
-      "experimental/stacktrace/common/config.h",
-      "experimental/stacktrace/common/debug.cpp",
-      "experimental/stacktrace/common/debug.h",
-      "experimental/stacktrace/common/failed.h",
-      "experimental/stacktrace/common/fd.cpp",
-      "experimental/stacktrace/common/fd.h",
-      "experimental/stacktrace/common/images.h",
-      "experimental/stacktrace/context.cpp",
-      "experimental/stacktrace/linux/linux-dl.cpp",
-      "experimental/stacktrace/linux/linux-elf.cpp",
-      "experimental/stacktrace/linux/linux-sym.cpp",
-      "experimental/stacktrace/linux/linux.h",
-      "experimental/stacktrace/osx/osx.cpp",
-      "experimental/stacktrace/osx/osx.h",
-      "experimental/stacktrace/stacktrace.cpp",
-      "experimental/stacktrace/tools/addr2line.cpp",
-      "experimental/stacktrace/tools/atos.cpp",
-      "experimental/stacktrace/tools/llvm_symbolizer.cpp",
-      "experimental/stacktrace/tools/pspawn.h",
-      "experimental/stacktrace/tools/tools.h",
-      "experimental/stacktrace/tools/toolspawner.cpp",
-      "experimental/stacktrace/unwind/unwind.cpp",
-      "experimental/stacktrace/unwind/unwind.h",
-      "experimental/stacktrace/windows/dbghelp_dll.cpp",
-      "experimental/stacktrace/windows/dbghelp_dll.h",
-      "experimental/stacktrace/windows/dll.cpp",
-      "experimental/stacktrace/windows/dll.h",
-      "experimental/stacktrace/windows/psapi_dll.cpp",
-      "experimental/stacktrace/windows/psapi_dll.h",
-      "experimental/stacktrace/windows/win_impl.cpp",
-      "experimental/stacktrace/windows/win_impl.h",
-    ]
     if (libcxx_enable_filesystem && libcxx_enable_time_zone_database) {
       sources += [
         # TODO TZDB The exception could be moved in chrono once the TZDB library
