On 6/24/19 4:09 PM, Richard Biener wrote:
> You still get one instance in each TU ...
Right, fixed in attached patch.
Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
Ready to be installed?
Thanks,
Martin
>From aa5ea14a8665b14aa60245c42bd4c9809d0bf81a Mon Sep 17 00:00:00 2001
From: Martin Liska <mli...@suse.cz>
Date: Tue, 25 Jun 2019 10:33:39 +0200
Subject: [PATCH] Put hashtab_chk_error into hash-table.c.
gcc/ChangeLog:
2019-06-25 Martin Liska <mli...@suse.cz>
* hash-table.c (hashtab_chk_error): Move here from ...
* hash-table.h (hashtab_chk_error): ... here.
---
gcc/hash-table.c | 12 ++++++++++++
gcc/hash-table.h | 14 ++------------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/gcc/hash-table.c b/gcc/hash-table.c
index 8e86fffa36f..e3b5d3da09e 100644
--- a/gcc/hash-table.c
+++ b/gcc/hash-table.c
@@ -124,3 +124,15 @@ void dump_hash_table_loc_statistics (void)
hash_table_usage ().dump (origin);
}
}
+
+/* Report a hash table checking error. */
+
+ATTRIBUTE_NORETURN ATTRIBUTE_COLD
+void
+hashtab_chk_error ()
+{
+ fprintf (stderr, "hash table checking failed: "
+ "equal operator returns true for a pair "
+ "of values with a different hash value\n");
+ gcc_unreachable ();
+}
diff --git a/gcc/hash-table.h b/gcc/hash-table.h
index 4f5e150a0ac..a39fb942158 100644
--- a/gcc/hash-table.h
+++ b/gcc/hash-table.h
@@ -303,6 +303,8 @@ extern unsigned int hash_table_sanitize_eq_limit;
extern unsigned int hash_table_higher_prime_index (unsigned long n)
ATTRIBUTE_PURE;
+extern ATTRIBUTE_NORETURN ATTRIBUTE_COLD void hashtab_chk_error ();
+
/* Return X % Y using multiplicative inverse values INV and SHIFT.
The multiplicative inverses computed above are for 32-bit types,
@@ -1010,18 +1012,6 @@ hash_table<Descriptor, Lazy, Allocator>
return &m_entries[index];
}
-/* Report a hash table checking error. */
-
-ATTRIBUTE_NORETURN ATTRIBUTE_COLD
-static void
-hashtab_chk_error ()
-{
- fprintf (stderr, "hash table checking failed: "
- "equal operator returns true for a pair "
- "of values with a different hash value\n");
- gcc_unreachable ();
-}
-
/* Verify that all existing elements in th hash table which are
equal to COMPARABLE have an equal HASH value provided as argument. */
--
2.21.0
