From 79d9b2dea234d3e7c3fbc13ab1d0160ef08e9f59 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 31 Oct 2015 12:19:44 -0400 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/pt.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 52ec43160f5..a995242621f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2015-10-31 Jason Merrill + * 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 438ec2df18d..243464dbb88 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); } -- 2.30.2