Skip to content

Commit 316e17c

Browse files
Move stacktrace headers out of experimental
1 parent 6d4431a commit 316e17c

File tree

12 files changed

+57
-64
lines changed

12 files changed

+57
-64
lines changed

libcxx/include/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,12 @@ set(files
727727
__ranges/views.h
728728
__ranges/zip_view.h
729729
__split_buffer
730+
__stacktrace/basic_stacktrace.h
731+
__stacktrace/detail/alloc.h
732+
__stacktrace/detail/context.h
733+
__stacktrace/detail/entry.h
734+
__stacktrace/detail/to_string.h
735+
__stacktrace/stacktrace_entry.h
730736
__std_mbstate_t.h
731737
__stop_token/atomic_unique_lock.h
732738
__stop_token/intrusive_list_view.h
@@ -991,17 +997,10 @@ set(files
991997
experimental/__simd/traits.h
992998
experimental/__simd/utility.h
993999
experimental/__simd/vec_ext.h
994-
experimental/__stacktrace/basic_stacktrace.h
995-
experimental/__stacktrace/detail/alloc.h
996-
experimental/__stacktrace/detail/context.h
997-
experimental/__stacktrace/detail/entry.h
998-
experimental/__stacktrace/detail/to_string.h
999-
experimental/__stacktrace/stacktrace_entry.h
10001000
experimental/iterator
10011001
experimental/memory
10021002
experimental/propagate_const
10031003
experimental/simd
1004-
experimental/stacktrace
10051004
experimental/type_traits
10061005
experimental/utility
10071006
ext/__hash
@@ -1054,6 +1053,7 @@ set(files
10541053
span
10551054
sstream
10561055
stack
1056+
stacktrace
10571057
stdatomic.h
10581058
stdbool.h
10591059
stddef.h

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
#include <memory>
3838
#include <string>
3939

40-
#include <experimental/__stacktrace/detail/alloc.h>
41-
#include <experimental/__stacktrace/detail/context.h>
42-
#include <experimental/__stacktrace/detail/to_string.h>
40+
#include <__stacktrace/detail/alloc.h>
41+
#include <__stacktrace/detail/context.h>
42+
#include <__stacktrace/detail/to_string.h>
4343

4444
_LIBCPP_BEGIN_NAMESPACE_STD
4545

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <cstdint>
3434
#include <string>
3535

36-
#include "experimental/__stacktrace/detail/entry.h"
36+
#include <__stacktrace/detail/entry.h>
3737

3838
_LIBCPP_BEGIN_NAMESPACE_STD
3939

libcxx/include/module.modulemap.in

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,6 +1985,17 @@ module std [system] {
19851985
export *
19861986
}
19871987

1988+
module stacktrace {
1989+
module basic_stacktrace { header "__stacktrace/basic_stacktrace.h" }
1990+
module alloc { header "__stacktrace/detail/alloc.h" }
1991+
module context { header "__stacktrace/detail/context.h" }
1992+
module entry { header "__stacktrace/detail/entry.h" }
1993+
module to_string { header "__stacktrace/detail/to_string.h" }
1994+
module stacktrace_entry { header "__stacktrace/stacktrace_entry.h" }
1995+
header "stacktrace"
1996+
export *
1997+
}
1998+
19881999
module stdexcept {
19892000
header "stdexcept"
19902001
export *
@@ -2225,16 +2236,6 @@ module std [system] {
22252236
header "experimental/simd"
22262237
export *
22272238
}
2228-
module stacktrace {
2229-
private header "experimental/__stacktrace/basic_stacktrace.h"
2230-
private header "experimental/__stacktrace/detail/alloc.h"
2231-
private header "experimental/__stacktrace/detail/context.h"
2232-
private header "experimental/__stacktrace/detail/entry.h"
2233-
private header "experimental/__stacktrace/detail/to_string.h"
2234-
private header "experimental/__stacktrace/stacktrace_entry.h"
2235-
header "experimental/stacktrace"
2236-
export *
2237-
}
22382239
}
22392240

22402241
// Implementation detail headers that are private to libc++. These modules

libcxx/include/experimental/stacktrace renamed to libcxx/include/stacktrace

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ namespace std {
180180
_LIBCPP_PUSH_MACROS
181181
# include <__undef_macros>
182182

183-
# include "experimental/__stacktrace/basic_stacktrace.h"
184-
# include "experimental/__stacktrace/stacktrace_entry.h"
183+
# include <__stacktrace/basic_stacktrace.h>
184+
# include <__stacktrace/stacktrace_entry.h>
185185

186186
_LIBCPP_POP_MACROS
187187

libcxx/modules/std.compat.cppm.in

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ module;
7171
# if __has_include(<spanstream>)
7272
# error "please update the header information for <spanstream> in headers_not_available in utils/libcxx/header_information.py"
7373
# endif // __has_include(<spanstream>)
74-
# if __has_include(<stacktrace>)
75-
# error "please update the header information for <stacktrace> in headers_not_available in utils/libcxx/header_information.py"
76-
# endif // __has_include(<stacktrace>)
7774
# if __has_include(<stdfloat>)
7875
# error "please update the header information for <stdfloat> in headers_not_available in utils/libcxx/header_information.py"
7976
# endif // __has_include(<stdfloat>)
@@ -86,4 +83,4 @@ export module std.compat;
8683
export import std;
8784

8885

89-
@LIBCXX_MODULE_STD_COMPAT_INCLUDE_SOURCES@
86+
@LIBCXX_MODULE_STD_COMPAT_INCLUDE_SOURCES@

0 commit comments

Comments
 (0)