From f0a9d33d6907a088b55dae7aea8cd80ce56c4909 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 1 Dec 2014 13:48:21 +0000 Subject: [PATCH] re PR middle-end/64111 (ICE: conversion of register to a different size) 2014-12-01 Richard Biener 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 --- gcc/ChangeLog | 6 ++++++ gcc/tree.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + 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 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) -- 2.47.2