From cbd0fe22a5ced9751d2450dc4fd6fe3525c2fc02 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 15 Nov 2023 09:17:49 +0000 Subject: [PATCH] libstdc++: std::stacktrace tweaks Fix a typo in a string literal and make the new hash.cc test gracefully handle missing stacktrace data (see PR 112541). libstdc++-v3/ChangeLog: * include/std/stacktrace (basic_stacktrace::at): Fix class name in exception message. * testsuite/19_diagnostics/stacktrace/hash.cc: Do not fail if current() returns a non-empty stacktrace. --- libstdc++-v3/include/std/stacktrace | 2 +- libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/std/stacktrace b/libstdc++-v3/include/std/stacktrace index 9a0d0b16068..9d5f6396aed 100644 --- a/libstdc++-v3/include/std/stacktrace +++ b/libstdc++-v3/include/std/stacktrace @@ -425,7 +425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION at(size_type __n) const { if (__n >= size()) - __throw_out_of_range("basic_stack_trace::at: bad frame number"); + __throw_out_of_range("basic_stacktrace::at: bad frame number"); return begin()[__n]; } diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc index 88831efd687..21705098ff0 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc @@ -12,9 +12,10 @@ test_hash() using Alloc = __gnu_test::uneq_allocator; using S = std::basic_stacktrace; S s; + S cur = S::current(); std::size_t h = std::hash()(s); - std::size_t h2 = std::hash()(S::current()); - VERIFY( h != h2 ); + std::size_t h2 = std::hash()(cur); + VERIFY( cur.empty() == (h == h2) ); } int main() -- 2.11.4.GIT