re PR middle-end/64111 (ICE: conversion of register to a different size)

2014-12-01  Richard Biener  <rguenther@suse.de>

	PR middle-end/64111
	* tree.c (int_cst_hash_hash): Use TYPE_UID instead of
	htab_hash_pointer to not break PCH.

From-SVN: r218214

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7e04d5e7f2245a19371e7750a6961132ca91a817..1941e70d20cae1d1b7f6febc43abff9bb62d666e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-01  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/64111
+       * tree.c (int_cst_hash_hash): Use TYPE_UID instead of
+       htab_hash_pointer to not break PCH.
+
 2014-11-28  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline

diff --git a/gcc/tree.c b/gcc/tree.c
index 006c48134d4ec6d3e77ed3e9235e30fe364e4548..077eed8ac082c92464177ab0eaab3019d3a2feda 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -1130,7 +1130,7 @@ int_cst_hash_hash (const void *x)
   const_tree const t = (const_tree) x;
 
   return (TREE_INT_CST_HIGH (t) ^ TREE_INT_CST_LOW (t)
-         ^ htab_hash_pointer (TREE_TYPE (t)));
+         ^ TYPE_UID (TREE_TYPE (t)));
 }
 
 /* Return nonzero if the value represented by *X (an INTEGER_CST tree node)