From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 14 Jul 2021 08:22:50 +0000 (+0200)
Subject: godump: Fix -fdump-go-spec= reproduceability issue [PR101407]
X-Git-Tag: releases/gcc-11.2.0~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31b76a815fc177dd579adc03b671ba9a8846ae6c;p=people%2Fms%2Fgcc.git

godump: Fix -fdump-go-spec= reproduceability issue [PR101407]

pot_dummy_types is a hash_set from whose traversal the code prints some type
lines.  hash_set normally uses default_hash_traits which for pointer types
(the hash set hashes const char *) uses pointer_hash which hashes the
addresses of the pointers except of the least significant 3 bits.
With address space randomization, that results in non-determinism in the
-fdump-go-specs= generated file, each invocation can have different order of
the lines emitted from pot_dummy_types traversal.

This patch fixes it by hashing the string contents instead to make the
hashes reproduceable.

2021-07-14  Jakub Jelinek  <jakub@redhat.com>

	PR go/101407
	* godump.c (godump_str_hash): New type.
	(godump_container::pot_dummy_types): Use string_hash instead of
	ptr_hash in the hash_set.

(cherry picked from commit 3be762c2ed79e36b9c8faaea2be04725c967a34e)
---

diff --git a/gcc/godump.c b/gcc/godump.c
index 7864d9d63e5..186f0cc912e 100644
--- a/gcc/godump.c
+++ b/gcc/godump.c
@@ -56,6 +56,8 @@ static FILE *go_dump_file;
 
 static GTY(()) vec<tree, va_gc> *queue;
 
+struct godump_str_hash : string_hash, ggc_remove <const char *> {};
+
 /* A hash table of macros we have seen.  */
 
 static htab_t macro_hash;
@@ -543,7 +545,7 @@ public:
 
   /* Types which may potentially have to be defined as dummy
      types.  */
-  hash_set<const char *> pot_dummy_types;
+  hash_set<const char *, false, godump_str_hash> pot_dummy_types;
 
   /* Go keywords.  */
   htab_t keyword_hash;