Skip to content

Commit f36bc5e

Browse files
elsteveograndeelsteveogrande
committed
Move stacktrace srcs out of experimental
1 parent 28b57a1 commit f36bc5e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+203
-201
lines changed

‎libcxx/docs/UserDocumentation.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ when ``-fexperimental-library`` is passed:
7070

7171
* The parallel algorithms library (``<execution>`` and the associated algorithms)
7272
* ``std::chrono::tzdb`` and related time zone functionality
73-
* ``<stacktrace>``
7473
* ``<syncstream>``
7574

7675
.. note::

‎libcxx/include/__stacktrace/basic_stacktrace.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
#ifndef _LIBCPP_EXPERIMENTAL_BASIC_STACKTRACE
11-
#define _LIBCPP_EXPERIMENTAL_BASIC_STACKTRACE
10+
#ifndef _LIBCPP_BASIC_STACKTRACE
11+
#define _LIBCPP_BASIC_STACKTRACE
1212

13-
#include <experimental/__stacktrace/detail/entry.h>
14-
#include <experimental/__stacktrace/stacktrace_entry.h>
13+
#include <__stacktrace/detail/entry.h>
14+
#include <__stacktrace/stacktrace_entry.h>
1515

1616
#include <__config>
1717
#include <__format/formatter.h>
@@ -303,4 +303,4 @@ struct _LIBCPP_EXPORTED_FROM_ABI hash<basic_stacktrace<_Allocator>> {
303303

304304
_LIBCPP_END_NAMESPACE_STD
305305

306-
#endif // _LIBCPP_EXPERIMENTAL_BASIC_STACKTRACE
306+
#endif // _LIBCPP_BASIC_STACKTRACE

‎libcxx/include/__stacktrace/detail/alloc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE_ALLOC
11-
#define _LIBCPP_EXPERIMENTAL_STACKTRACE_ALLOC
10+
#ifndef _LIBCPP_STACKTRACE_ALLOC
11+
#define _LIBCPP_STACKTRACE_ALLOC
1212

1313
#include <__config>
1414
#include <__functional/function.h>
@@ -100,4 +100,4 @@ struct alloc final : std::pmr::memory_resource {
100100
} // namespace __stacktrace
101101
_LIBCPP_END_NAMESPACE_STD
102102

103-
#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_ALLOC
103+
#endif // _LIBCPP_STACKTRACE_ALLOC

‎libcxx/include/__stacktrace/detail/context.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE_CONTEXT
11-
#define _LIBCPP_EXPERIMENTAL_STACKTRACE_CONTEXT
10+
#ifndef _LIBCPP_STACKTRACE_CONTEXT
11+
#define _LIBCPP_STACKTRACE_CONTEXT
1212

1313
#include <__config>
1414
#include <__memory_resource/memory_resource.h>
@@ -18,8 +18,8 @@
1818
#include <cstddef>
1919
#include <string>
2020

21-
#include <experimental/__stacktrace/detail/alloc.h>
22-
#include <experimental/__stacktrace/detail/entry.h>
21+
#include <__stacktrace/detail/alloc.h>
22+
#include <__stacktrace/detail/entry.h>
2323

2424
_LIBCPP_BEGIN_NAMESPACE_STD
2525

@@ -50,4 +50,4 @@ struct _LIBCPP_HIDE_FROM_ABI context {
5050
} // namespace __stacktrace
5151
_LIBCPP_END_NAMESPACE_STD
5252

53-
#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_CONTEXT
53+
#endif // _LIBCPP_STACKTRACE_CONTEXT

‎libcxx/include/__stacktrace/detail/entry.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE_DETAIL_ENTRY
11-
#define _LIBCPP_EXPERIMENTAL_STACKTRACE_DETAIL_ENTRY
10+
#ifndef _LIBCPP_STACKTRACE_DETAIL_ENTRY
11+
#define _LIBCPP_STACKTRACE_DETAIL_ENTRY
1212

1313
#include <__config>
1414
#include <cstdint>
@@ -41,4 +41,4 @@ struct _LIBCPP_HIDE_FROM_ABI entry {
4141
} // namespace __stacktrace
4242
_LIBCPP_END_NAMESPACE_STD
4343

44-
#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_DETAIL_ENTRY
44+
#endif // _LIBCPP_STACKTRACE_DETAIL_ENTRY

‎libcxx/include/__stacktrace/detail/to_string.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE_TO_STRING
11-
#define _LIBCPP_EXPERIMENTAL_STACKTRACE_TO_STRING
10+
#ifndef _LIBCPP_STACKTRACE_TO_STRING
11+
#define _LIBCPP_STACKTRACE_TO_STRING
1212

1313
#include <__config>
1414
#include <__fwd/sstream.h>
@@ -43,4 +43,4 @@ struct _LIBCPP_HIDE_FROM_ABI __to_string {
4343

4444
_LIBCPP_END_NAMESPACE_STD
4545

46-
#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_TO_STRING
46+
#endif // _LIBCPP_STACKTRACE_TO_STRING

‎libcxx/include/__stacktrace/stacktrace_entry.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE_ENTRY
11-
#define _LIBCPP_EXPERIMENTAL_STACKTRACE_ENTRY
10+
#ifndef _LIBCPP_STACKTRACE_ENTRY
11+
#define _LIBCPP_STACKTRACE_ENTRY
1212

1313
#include <__cstddef/byte.h>
1414
#include <__cstddef/ptrdiff_t.h>
@@ -108,4 +108,4 @@ struct _LIBCPP_EXPORTED_FROM_ABI hash<stacktrace_entry> {
108108

109109
_LIBCPP_END_NAMESPACE_STD
110110

111-
#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE_ENTRY
111+
#endif // _LIBCPP_STACKTRACE_ENTRY

‎libcxx/include/stacktrace

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
#ifndef _LIBCPP_EXPERIMENTAL_STACKTRACE
11-
#define _LIBCPP_EXPERIMENTAL_STACKTRACE
10+
#ifndef _LIBCPP_STACKTRACE
11+
#define _LIBCPP_STACKTRACE
1212

1313
/*
1414
Header <stacktrace> synopsis
@@ -188,4 +188,4 @@ _LIBCPP_POP_MACROS
188188
# endif // _LIBCPP_STD_VER >= 23
189189
#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
190190

191-
#endif // _LIBCPP_EXPERIMENTAL_STACKTRACE
191+
#endif // _LIBCPP_STACKTRACE

‎libcxx/modules/std/stacktrace.inc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
//===----------------------------------------------------------------------===//
99

1010
export namespace std {
11-
// TODO(stacktrace23): update this when stacktrace is taken out of experimental
12-
#if 0 //_LIBCPP_STD_VER >= 23
11+
#if _LIBCPP_STD_VER >= 23
1312

1413
// [stacktrace.entry], class stacktrace_­entry
1514
using std::stacktrace_entry;

‎libcxx/src/CMakeLists.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,24 @@ set(LIBCXX_SOURCES
4040
ryu/d2fixed.cpp
4141
ryu/d2s.cpp
4242
ryu/f2s.cpp
43+
stacktrace/alloc.cpp
44+
stacktrace/common/debug.cpp
45+
stacktrace/common/fd.cpp
46+
stacktrace/context.cpp
47+
stacktrace/linux/linux-dl.cpp
48+
stacktrace/linux/linux-elf.cpp
49+
stacktrace/linux/linux-sym.cpp
50+
stacktrace/osx/osx.cpp
51+
stacktrace/stacktrace.cpp
52+
stacktrace/tools/addr2line.cpp
53+
stacktrace/tools/atos.cpp
54+
stacktrace/tools/llvm_symbolizer.cpp
55+
stacktrace/tools/toolspawner.cpp
56+
stacktrace/unwind/unwind.cpp
57+
stacktrace/windows/dbghelp_dll.cpp
58+
stacktrace/windows/dll.cpp
59+
stacktrace/windows/psapi_dll.cpp
60+
stacktrace/windows/win_impl.cpp
4361
stdexcept.cpp
4462
string.cpp
4563
support/runtime/exception_fallback.ipp
@@ -309,24 +327,6 @@ add_custom_target(cxx DEPENDS ${LIBCXX_BUILD_TARGETS})
309327
# Build the experimental static library
310328
set(LIBCXX_EXPERIMENTAL_SOURCES
311329
experimental/keep.cpp
312-
experimental/stacktrace/alloc.cpp
313-
experimental/stacktrace/common/debug.cpp
314-
experimental/stacktrace/common/fd.cpp
315-
experimental/stacktrace/context.cpp
316-
experimental/stacktrace/linux/linux-dl.cpp
317-
experimental/stacktrace/linux/linux-elf.cpp
318-
experimental/stacktrace/linux/linux-sym.cpp
319-
experimental/stacktrace/osx/osx.cpp
320-
experimental/stacktrace/stacktrace.cpp
321-
experimental/stacktrace/tools/addr2line.cpp
322-
experimental/stacktrace/tools/atos.cpp
323-
experimental/stacktrace/tools/llvm_symbolizer.cpp
324-
experimental/stacktrace/tools/toolspawner.cpp
325-
experimental/stacktrace/unwind/unwind.cpp
326-
experimental/stacktrace/windows/dbghelp_dll.cpp
327-
experimental/stacktrace/windows/dll.cpp
328-
experimental/stacktrace/windows/psapi_dll.cpp
329-
experimental/stacktrace/windows/win_impl.cpp
330330
)
331331

332332
if (LIBCXX_PSTL_BACKEND STREQUAL "libdispatch")

0 commit comments

Comments
 (0)