From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id B5B053858D35; Wed, 15 Nov 2023 11:32:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B5B053858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1700047976; bh=P2lK1lCDquBRhADIS2D6VcFQIqkFTLhByDMBmqyxvwQ=; h=From:To:Subject:Date:From; b=jIXdRjXkhpoa/iq0mI7Ny8eSyQRrR6tQAhApIhX3vxSag4dtnZV/8jWM7AqwaF6JN N04XvWmHJouNdLnn2Dm0fCY4gxsW6MsQV3aAtVY7AmULXabqfzGQZmMsyU97fDZjWE TNjhDIDyk7iIpQLxiQ9jWlnjkVN8K3HSTMzpxHaM= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-8071] libstdc++: std::stacktrace tweaks X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 63690ce8174c8b8d13e8d1a1f01b19e4f6d93e9e X-Git-Newrev: b51b9e0861548e4b7a77f1d2cfcecb26440a0859 Message-Id: <20231115113256.B5B053858D35@sourceware.org> Date: Wed, 15 Nov 2023 11:32:56 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b51b9e0861548e4b7a77f1d2cfcecb26440a0859 commit r13-8071-gb51b9e0861548e4b7a77f1d2cfcecb26440a0859 Author: Jonathan Wakely Date: Wed Nov 15 09:17:49 2023 +0000 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. (cherry picked from commit cbd0fe22a5ced9751d2450dc4fd6fe3525c2fc02) Diff: --- 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 96702935433..e4ca2d6bfa9 100644 --- a/libstdc++-v3/include/std/stacktrace +++ b/libstdc++-v3/include/std/stacktrace @@ -496,7 +496,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 cf18476f2a7..a2f61e49981 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()