From: rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 25 Jun 2015 17:16:15 +0000 (+0000)
Subject: gcc/
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22fd03a551df35a59ba22f3f68464a7b25379c32;p=thirdparty%2Fgcc.git

gcc/
	* tree-hash-traits.h (tree_hash): New class.
	* except.c: Include tree-hash-traits.h.
	(tree_hash_traits): Use tree_hash.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224970 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f95f2dcc9470..6389191c1330 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-25  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* tree-hash-traits.h (tree_hash): New class.
+	* except.c: Include tree-hash-traits.h.
+	(tree_hash_traits): Use tree_hash.
+
 2015-06-25  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* tree-hash-traits.h (tree_ssa_name_hasher): New class.
diff --git a/gcc/except.c b/gcc/except.c
index ce1e31f0645b..081b402fc50a 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -159,14 +159,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "tree-pass.h"
 #include "cfgloop.h"
 #include "builtins.h"
+#include "tree-hash-traits.h"
 
 static GTY(()) int call_site_base;
 
-struct tree_hash_traits : default_hashmap_traits
-{
-  static hashval_t hash (tree t) { return TREE_HASH (t); }
-};
-
+struct tree_hash_traits : simple_hashmap_traits <tree_hash> {};
 static GTY (()) hash_map<tree, tree, tree_hash_traits> *type_to_runtime_map;
 
 /* Describe the SjLj_Function_Context structure.  */
diff --git a/gcc/tree-hash-traits.h b/gcc/tree-hash-traits.h
index 1f4364f591e5..1edc49eda467 100644
--- a/gcc/tree-hash-traits.h
+++ b/gcc/tree-hash-traits.h
@@ -67,4 +67,16 @@ tree_ssa_name_hash::hash (tree t)
   return SSA_NAME_VERSION (t);
 }
 
+/* Hasher for general trees, based on their TREE_HASH.  */
+struct tree_hash : ggc_ptr_hash <tree_node>
+{
+  static hashval_t hash (tree);
+};
+
+inline hashval_t
+tree_hash::hash (tree t)
+{
+  return TREE_HASH (t);
+}
+
 #endif