From: Richard Biener <rguenther@suse.de>
Date: Mon, 1 Dec 2014 13:48:21 +0000 (+0000)
Subject: re PR middle-end/64111 (ICE: conversion of register to a different size)
X-Git-Tag: releases/gcc-4.8.4~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0a9d33d6907a088b55dae7aea8cd80ce56c4909;p=thirdparty%2Fgcc.git

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 7e04d5e7f224..1941e70d20ca 100644
--- 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 006c48134d4e..077eed8ac082 100644
--- 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)