aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2015-10-31 12:19:44 -0400
committerJason Merrill <jason@gcc.gnu.org>2015-10-31 12:19:44 -0400
commit79d9b2dea234d3e7c3fbc13ab1d0160ef08e9f59 (patch)
tree2dac8c03df20ccf99c2ec9410ca837606a1dac92 /gcc
parentdfded2f6b4c566dfc8da913a9078fdcf71751968 (diff)
downloadgcc-79d9b2dea234d3e7c3fbc13ab1d0160ef08e9f59.zip
gcc-79d9b2dea234d3e7c3fbc13ab1d0160ef08e9f59.tar.gz
gcc-79d9b2dea234d3e7c3fbc13ab1d0160ef08e9f59.tar.bz2
pt.c (hash_tmpl_and_args): Use iterative_hash_object on template uid.
* pt.c (hash_tmpl_and_args): Use iterative_hash_object on template uid. From-SVN: r229626
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/pt.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 52ec431..a995242 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2015-10-31 Jason Merrill <jason@redhat.com>
+ * pt.c (hash_tmpl_and_args): Use iterative_hash_object on template
+ uid.
+
* parser.c (synthesize_implicit_template_parm)
(finish_fully_implicit_template): Make static.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 438ec2d..243464d 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1682,7 +1682,7 @@ spec_hasher::equal (spec_entry *e1, spec_entry *e2)
static hashval_t
hash_tmpl_and_args (tree tmpl, tree args)
{
- hashval_t val = DECL_UID (tmpl);
+ hashval_t val = iterative_hash_object (DECL_UID (tmpl), 0);
return iterative_hash_template_arg (args, val);
}