From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
	id 5988F3858417; Tue, 14 Nov 2023 22:40:10 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5988F3858417
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1700001610;
	bh=Osx/hNdFnvTIVewrcHeuT5MdKDzljpGP9CBNPL2A4LU=;
	h=From:To:Subject:Date:From;
	b=dPK4DDOb1NRYcfDeaJDMWgn7XuISqEGtrzWn35t621e8FbccmIH2zz6o08pi8E4YW
	 FCmx4CXOMJYWIl2CATB1NoGANlFhIYYWOCgVa4TJ4XGp/a1nQlTUDe8Y/bkWl1xx/Z
	 r6TyoODshIjFKRBfDU9AWwmSLdB66f5gk7+MciBE=
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r13-8067] libstdc++: Fix std::hash<std::stacktrace> [PR112348]
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-13
X-Git-Oldrev: 5cb055e99d2026c734602ffdc28cb8b357a7b28e
X-Git-Newrev: 16635b89f36c07b9e06c48a93d1bfafa93178328
Message-Id: <20231114224010.5988F3858417@sourceware.org>
Date: Tue, 14 Nov 2023 22:40:10 +0000 (GMT)
List-Id: <gcc-cvs.sourceware.org>

https://gcc.gnu.org/g:16635b89f36c07b9e06c48a93d1bfafa93178328

commit r13-8067-g16635b89f36c07b9e06c48a93d1bfafa93178328
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Nov 14 22:36:31 2023 +0000

    libstdc++: Fix std::hash<std::stacktrace> [PR112348]
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/112348
            * include/std/stacktrace (hash<basic_stacktrace<Alloc>>): Fix
            type of hash function for entries.
            * testsuite/19_diagnostics/stacktrace/hash.cc: New test.
    
    (cherry picked from commit 6f2fc42d9e52e8322e718e0154cd235d00906f99)

Diff:
---
 libstdc++-v3/include/std/stacktrace                |  2 +-
 .../testsuite/19_diagnostics/stacktrace/hash.cc    | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/std/stacktrace b/libstdc++-v3/include/std/stacktrace
index 346c7b14142..96702935433 100644
--- a/libstdc++-v3/include/std/stacktrace
+++ b/libstdc++-v3/include/std/stacktrace
@@ -790,7 +790,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       size_t
       operator()(const basic_stacktrace<_Allocator>& __st) const noexcept
       {
-	hash<stacktrace_entry::native_handle_type> __h;
+	hash<stacktrace_entry> __h;
 	size_t __val = _Hash_impl::hash(__st.size());
 	for (const auto& __f : __st)
 	  __val = _Hash_impl::__hash_combine(__h(__f), __val);
diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc
new file mode 100644
index 00000000000..cf18476f2a7
--- /dev/null
+++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc
@@ -0,0 +1,23 @@
+// { dg-options "-std=gnu++23 -lstdc++_libbacktrace" }
+// { dg-do run { target c++23 } }
+// { dg-require-effective-target stacktrace }
+
+#include <stacktrace>
+#include <testsuite_allocator.h>
+#include <testsuite_hooks.h>
+
+void
+test_hash()
+{
+  using Alloc = __gnu_test::uneq_allocator<std::stacktrace_entry>;
+  using S = std::basic_stacktrace<Alloc>;
+  S s;
+  std::size_t h = std::hash<S>()(s);
+  std::size_t h2 = std::hash<S>()(S::current());
+  VERIFY( h != h2 );
+}
+
+int main()
+{
+  test_hash();
+}