Clean up tests and fix some 'noexcepts'

Author: elsteveogrande

libcxx/include/__stacktrace/basic_stacktrace.h

@@ -10,16 +10,8 @@
 #ifndef _LIBCPP___BASIC_STACKTRACE_H
 #define _LIBCPP___BASIC_STACKTRACE_H
 
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
-
-_LIBCPP_PUSH_MACROS
-#include <__undef_macros>
-
 #include <__assert>
+#include <__config>
 #include <__cstddef/size_t.h>
 #include <__functional/function.h>
 #include <__functional/hash.h>
@@ -29,24 +21,28 @@ _LIBCPP_PUSH_MACROS
 #include <__memory/allocator_traits.h>
 #include <__memory_resource/polymorphic_allocator.h>
 #include <__new/allocate.h>
+#include <__stacktrace/stacktrace_entry.h>
 #include <__type_traits/is_nothrow_constructible.h>
 #include <__vector/vector.h>
 #include <cstddef>
 #include <iostream>
 #include <string>
 #include <utility>
-
 #if _LIBCPP_HAS_LOCALIZATION
 #  include <__fwd/ostream.h>
 #endif // _LIBCPP_HAS_LOCALIZATION
-
 #if !defined(_WIN32)
 #  include <unwind.h>
 #endif
 
-#if _LIBCPP_STD_VER >= 23 && _LIBCPP_AVAILABILITY_HAS_STACKTRACE
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
 
-#  include <__stacktrace/stacktrace_entry.h>
+#if _LIBCPP_STD_VER >= 23 && _LIBCPP_AVAILABILITY_HAS_STACKTRACE
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
@@ -103,12 +99,9 @@ class basic_stacktrace : private __stacktrace::_Trace {
   friend struct __stacktrace::_Trace;
 
   vector<stacktrace_entry, _Allocator> __entries_;
-  _LIBCPP_HIDE_FROM_ABI _EntryIters entry_iters() {
-    auto* __data = __entries_.data();
-    auto __size  = __entries_.size();
-    std::cerr << "@@@ data:" << __data << " size:" << __size << '\n';
-    return {__data, __size};
-  }
+
+  _LIBCPP_HIDE_FROM_ABI _EntryIters entry_iters() { return {__entries_.data(), __entries_.size()}; }
+
   _LIBCPP_HIDE_FROM_ABI __stacktrace::_Entry& entry_append() {
     return (__stacktrace::_Entry&)__entries_.emplace_back();
   }
@@ -170,10 +163,10 @@ class basic_stacktrace : private __stacktrace::_Trace {
   _LIBCPP_HIDE_FROM_ABI basic_stacktrace() noexcept(is_nothrow_default_constructible_v<allocator_type>)
       : basic_stacktrace(allocator_type()) {}
 
-  _LIBCPP_HIDE_FROM_ABI explicit basic_stacktrace(const allocator_type& __alloc)
+  _LIBCPP_HIDE_FROM_ABI explicit basic_stacktrace(const allocator_type& __alloc) noexcept
       : _Trace(entry_iters_fn(), entry_append_fn()), __entries_(__alloc) {}
 
-  _LIBCPP_HIDE_FROM_ABI basic_stacktrace(const basic_stacktrace& __other) noexcept
+  _LIBCPP_HIDE_FROM_ABI basic_stacktrace(const basic_stacktrace& __other)
       : _Trace(entry_iters_fn(), entry_append_fn()) {
     __entries_ = __other.__entries_;
   }
@@ -354,6 +347,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE inline void _Trace::populate_addrs(s
 #  endif // _WIN32
 
 _Trace& _Trace::base(auto& __trace) { return *static_cast<_Trace*>(std::addressof(__trace)); }
+
 _Trace const& _Trace::base(auto const& __trace) { return *static_cast<_Trace const*>(std::addressof(__trace)); }
 
 } // namespace __stacktrace

libcxx/include/__stacktrace/stacktrace_entry.h

@@ -10,28 +10,26 @@
 #ifndef _LIBCPP___STACKTRACE_ENTRY_H
 #define _LIBCPP___STACKTRACE_ENTRY_H
 
-#include <__config>
-#include <cstring>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
-
-_LIBCPP_PUSH_MACROS
-#include <__undef_macros>
-
 #include <__assert>
+#include <__config>
 #include <__functional/function.h>
 #include <__fwd/format.h>
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
 #include <string>
 #include <string_view>
-
 #if _LIBCPP_HAS_LOCALIZATION
 #  include <__fwd/ostream.h>
 #endif // _LIBCPP_HAS_LOCALIZATION
 
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
+
 #if _LIBCPP_STD_VER >= 23 && _LIBCPP_AVAILABILITY_HAS_STACKTRACE
 
 _LIBCPP_BEGIN_NAMESPACE_STD
@@ -52,23 +50,14 @@ struct _StringWrapper {
   //   4. just use std::string, which is just plain wrong
   //   5. ...?
 
-  char __chars_[1024]{0};
+  std::string __str_;
 
-  _LIBCPP_HIDE_FROM_ABI std::string_view view() const { return __chars_; }
+  _LIBCPP_HIDE_FROM_ABI std::string_view view() const { return __str_; }
 
   _LIBCPP_HIDE_FROM_ABI _StringWrapper& assign(std::string_view __view) {
-    size_t __size = std::min(__view.size(), sizeof(__chars_) - 1);
-    memcpy(__chars_, __view.data(), __size);
-    __chars_[__size] = 0;
+    __str_ = __view;
     return *this;
   }
-
-  _LIBCPP_HIDE_FROM_ABI ~_StringWrapper()                                = default;
-  _LIBCPP_HIDE_FROM_ABI _StringWrapper()                                 = default;
-  _LIBCPP_HIDE_FROM_ABI _StringWrapper(_StringWrapper const&)            = default;
-  _LIBCPP_HIDE_FROM_ABI _StringWrapper(_StringWrapper&&)                 = default;
-  _LIBCPP_HIDE_FROM_ABI _StringWrapper& operator=(_StringWrapper const&) = default;
-  _LIBCPP_HIDE_FROM_ABI _StringWrapper& operator=(_StringWrapper&&)      = default;
 };
 
 struct _Entry {
@@ -176,6 +165,7 @@ struct hash<stacktrace_entry> {
 namespace __stacktrace {
 
 _LIBCPP_HIDE_FROM_ABI inline _Entry& _Entry::base(stacktrace_entry& __entry) { return __entry.__base_; }
+
 _LIBCPP_HIDE_FROM_ABI inline _Entry const& _Entry::base(stacktrace_entry const& __entry) { return __entry.__base_; }
 
 } // namespace __stacktrace

libcxx/lib/abi/x86_64-unknown-linux-gnu.libcxxabi.v1.stable.exceptions.nonew.abilist

@@ -35,6 +35,7 @@
 {'is_defined': False, 'name': '_ZTVSt13runtime_error', 'size': 0, 'type': 'OBJECT'}
 {'is_defined': False, 'name': '_ZTVSt14overflow_error', 'size': 0, 'type': 'OBJECT'}
 {'is_defined': False, 'name': '_ZTVSt16invalid_argument', 'size': 0, 'type': 'OBJECT'}
+{'is_defined': False, 'name': '_ZTVSt9exception', 'size': 0, 'type': 'OBJECT'}
 {'is_defined': False, 'name': '_ZdaPv', 'type': 'FUNC'}
 {'is_defined': False, 'name': '_ZdaPvSt11align_val_t', 'type': 'FUNC'}
 {'is_defined': False, 'name': '_ZdlPv', 'type': 'FUNC'}
@@ -104,8 +105,10 @@
 {'is_defined': True, 'name': '_ZNKSt3__110moneypunctIwLb1EE16do_negative_signEv', 'type': 'FUNC'}
 {'is_defined': True, 'name': '_ZNKSt3__110moneypunctIwLb1EE16do_positive_signEv', 'type': 'FUNC'}
 {'is_defined': True, 'name': '_ZNKSt3__110moneypunctIwLb1EE16do_thousands_sepEv', 'type': 'FUNC'}
+{'is_defined': True, 'name': '_ZNKSt3__112__stacktrace6_Entry4hashEv', 'type': 'FUNC'}
 {'is_defined': True, 'name': '_ZNKSt3__112__stacktrace6_Entry8write_toERNS_13basic_ostreamIcNS_11char_traitsIcEEEE', 'type': 'FUNC'}
 {'is_defined': True, 'name': '_ZNKSt3__112__stacktrace6_Entry9to_stringEv', 'type': 'FUNC'}
+{'is_defined': True, 'name': '_ZNKSt3__112__stacktrace6_Trace4hashEv', 'type': 'FUNC'}
 {'is_defined': True, 'name': '_ZNKSt3__112__stacktrace6_Trace8write_toERNS_13basic_ostreamIcNS_11char_traitsIcEEEE', 'type': 'FUNC'}
 {'is_defined': True, 'name': '_ZNKSt3__112__stacktrace6_Trace9to_stringEv', 'type': 'FUNC'}
 {'is_defined': True, 'name': '_ZNKSt3__112bad_weak_ptr4whatEv', 'type': 'FUNC'}
@@ -1967,6 +1970,8 @@
 {'is_defined': True, 'name': '_ZTVNSt3__120__codecvt_utf8_utf16IDiEE', 'size': 96, 'type': 'OBJECT'}
 {'is_defined': True, 'name': '_ZTVNSt3__120__codecvt_utf8_utf16IDsEE', 'size': 96, 'type': 'OBJECT'}
 {'is_defined': True, 'name': '_ZTVNSt3__120__codecvt_utf8_utf16IwEE', 'size': 96, 'type': 'OBJECT'}
+{'is_defined': True, 'name': '_ZTVNSt3__120__time_get_c_storageIcEE', 'size': 72, 'type': 'OBJECT'}
+{'is_defined': True, 'name': '_ZTVNSt3__120__time_get_c_storageIwEE', 'size': 72, 'type': 'OBJECT'}
 {'is_defined': True, 'name': '_ZTVNSt3__13pmr15memory_resourceE', 'size': 56, 'type': 'OBJECT'}
 {'is_defined': True, 'name': '_ZTVNSt3__13pmr25monotonic_buffer_resourceE', 'size': 56, 'type': 'OBJECT'}
 {'is_defined': True, 'name': '_ZTVNSt3__13pmr26synchronized_pool_resourceE', 'size': 56, 'type': 'OBJECT'}

libcxx/modules/std/stacktrace.inc

@@ -8,15 +8,15 @@
 //===----------------------------------------------------------------------===//
 
 export namespace std {
-#if _LIBCPP_STD_VER >= 23
+#if _LIBCPP_STD_VER >= 23 && _LIBCPP_AVAILABILITY_HAS_STACKTRACE
 
-  // [stacktrace.entry], class stacktrace_­entry
+  // [stacktrace.entry], class stacktrace_entry
   using std::stacktrace_entry;
 
-  // [stacktrace.basic], class template basic_­stacktrace
+  // [stacktrace.basic], class template basic_stacktrace
   using std::basic_stacktrace;
 
-  // basic_­stacktrace typedef-names
+  // basic_stacktrace typedef-names
   using std::stacktrace;
 
   // [stacktrace.basic.nonmem], non-member functions
@@ -39,5 +39,5 @@ export namespace std {
   // P2693R1, "Formatting thread::id and stacktrace")
   // using std::formatter;
 
-#endif // _LIBCPP_STD_VER >= 23
+#endif // _LIBCPP_STD_VER >= 23 && _LIBCPP_AVAILABILITY_HAS_STACKTRACE
 } // namespace std

libcxx/test/libcxx/transitive_includes/cxx23.csv

@@ -926,19 +926,36 @@ stack limits
 stack stdexcept
 stack tuple
 stack version
+stacktrace array
+stacktrace bitset
 stacktrace cctype
+stacktrace cerrno
 stacktrace climits
+stacktrace clocale
+stacktrace cmath
 stacktrace compare
 stacktrace cstddef
 stacktrace cstdint
 stacktrace cstdio
+stacktrace cstdlib
 stacktrace cstring
+stacktrace ctime
 stacktrace cwchar
 stacktrace cwctype
+stacktrace format
 stacktrace initializer_list
+stacktrace ios
 stacktrace iosfwd
+stacktrace iostream
+stacktrace istream
 stacktrace limits
+stacktrace locale
+stacktrace optional
+stacktrace ostream
+stacktrace print
+stacktrace ratio
 stacktrace stdexcept
+stacktrace streambuf
 stacktrace string
 stacktrace string_view
 stacktrace tuple

libcxx/test/libcxx/transitive_includes/cxx26.csv

@@ -908,19 +908,35 @@ stack limits
 stack stdexcept
 stack tuple
 stack version
+stacktrace array
+stacktrace bitset
 stacktrace cctype
+stacktrace cerrno
 stacktrace climits
+stacktrace clocale
+stacktrace cmath
 stacktrace compare
 stacktrace cstddef
 stacktrace cstdint
 stacktrace cstdio
+stacktrace cstdlib
 stacktrace cstring
+stacktrace ctime
 stacktrace cwchar
 stacktrace cwctype
+stacktrace format
 stacktrace initializer_list
+stacktrace ios
 stacktrace iosfwd
+stacktrace iostream
+stacktrace istream
 stacktrace limits
+stacktrace optional
+stacktrace ostream
+stacktrace print
+stacktrace ratio
 stacktrace stdexcept
+stacktrace streambuf
 stacktrace string
 stacktrace string_view
 stacktrace tuple

libcxx/test/std/diagnostics/stacktrace/basic.cmp/equality.pass.cpp

@@ -7,53 +7,41 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: std-at-least-c++23
-// XFAIL: availability-stacktrace-missing
+// UNSUPPORTED: availability-stacktrace-missing
 
 // (19.6.4.4) Comparisons [stacktrace.basic.cmp]
-// template<class Allocator2>
-// friend bool operator==(const basic_stacktrace& x,
-//                         const basic_stacktrace<Allocator2>& y) noexcept;
+//
+//   template<class Allocator2>
+//   friend bool operator==(const basic_stacktrace& x,
+//                          const basic_stacktrace<Allocator2>& y) noexcept;
 
 #include <cassert>
 #include <stacktrace>
 
-#include "test_macros.h"
-
-// Disable TCO for calls into, and out from, the annotated function.
-#define STACKTRACE_AVOID_OPT TEST_NO_TAIL_CALLS_IN TEST_NO_TAIL_CALLS_OUT TEST_NOINLINE
-
-// Some non-inlinable functions to help contrive different stacktraces:
-// main calls the "middle" funcs, and those both call "top".
-// We'll consider main the "bottom" func, even though there are other functions
-// like `_start` which call main; those are trimmed via `max_depth` argument.
-
-STACKTRACE_AVOID_OPT std::stacktrace top(size_t skip, size_t depth) { return std::stacktrace::current(skip, depth); }
-STACKTRACE_AVOID_OPT std::stacktrace middle1(size_t skip, size_t depth) { return top(skip, depth); }
-STACKTRACE_AVOID_OPT std::stacktrace middle2(size_t skip, size_t depth) { return top(skip, depth); }
-
-STACKTRACE_AVOID_OPT int main(int, char**) {
-  // Collect a few different stacktraces and test `operator==` and `operator!=`.
-
-  std::stacktrace st0;                 // default-initializable empty stacktrace
-  static_assert(noexcept(st0 == st0)); // verify noexcept-ness
-  static_assert(noexcept(st0 != st0)); // verify noexcept-ness
-  assert(st0 == st0);                  // trivial: self-equality
-
-  std::stacktrace st1a = top(0, 2);     // st1a = [top, main]
-  assert(st1a == st1a);                 // trivial: self-equality
-  assert(st1a != st0);                  //
-  std::stacktrace st2a = middle1(0, 3); // st2a = [top, middle1, main]
-  assert(st2a == st2a);                 //
-  assert(st1a != st2a);                 //
-  std::stacktrace st2b = middle2(0, 3); // st2b = [top, middle2, main]
-  assert(st2b == st2b);                 //
-  assert(st2a != st2b);                 //
-
-  // Verify two equivalent stacktrace instances are equal, even if not "same".
-  // For both, we'll take only two entries, which should be equivalent.
-  std::stacktrace st3a = middle1(0, 2); // st3a = [top, middle1]
-  std::stacktrace st3b = middle1(0, 2); // st3b = [top, middle1]
-  assert(st3a == st3b);
+// Call chain is: main -> c -> b -> a -> stacktrace::current;
+// we're only checking a, b, c in the returned stacktrace, so use max_depth of 3.
+_LIBCPP_NOINLINE std::stacktrace a(size_t skip = 0) { return std::stacktrace::current(skip, 3); }
+_LIBCPP_NOINLINE std::stacktrace b(size_t skip = 0) { return a(skip); }
+_LIBCPP_NOINLINE std::stacktrace c(size_t skip = 0) { return b(skip); }
+
+int main(int, char**) {
+  std::stacktrace st0;
+  static_assert(noexcept(st0 == st0));
+  static_assert(noexcept(st0 != st0));
+  assert(st0 == st0);
+
+  std::stacktrace st1 = a();
+  assert(st1 != st0);
+
+  std::stacktrace st2 = b();
+  assert(st2 != st1);
+  assert(st2 != st0);
+
+  std::stacktrace st3 = c();
+  assert(st3 != st0);
+  assert(st3 != st1);
+  assert(st3 != st2);
+  assert(c() == st3);
 
   return 0;
 }