aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/cvt.c
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@redhat.com>2009-05-28 11:24:18 +0000
committerDodji Seketeli <dodji@gcc.gnu.org>2009-05-28 13:24:18 +0200
commitcd41d410da230dafae73a791281ef058c06a6c72 (patch)
treeb90e673a3046b819f2c25ca56d8e3043b60045f4 /gcc/cp/cvt.c
parent233215fe7cedf3cfa908f11c9543e1f7f10e3283 (diff)
downloadgcc-cd41d410da230dafae73a791281ef058c06a6c72.zip
gcc-cd41d410da230dafae73a791281ef058c06a6c72.tar.gz
gcc-cd41d410da230dafae73a791281ef058c06a6c72.tar.bz2
Fix for PR c++/PR39754
gcc/cp/ChangeLog: PR c++/39754 * cp-tree.h (canonical_type_variant): Remove this function declaration. (strip_typedefs): New function declaration. * tree.c (strip_typedefs): New function definition. (canonical_type_variant): Remove function definition. * cvt.c (convert_from_reference): No need to use canonical_type_variant. * typeck.c (cp_build_indirect_ref): Likewise. * error.c (dump_template_bindings): Use strip_typedefs instead of canonical_type_variant. * pt.c (convert_template_argument, unify): Likewise. * mangle.c (canonicalize_for_substitution): Don't use canonical_type_variant. gcc/testsuite/ChangeLog: PR c++/39754 * g++.dg/template/canon-type-1.C: New test. * g++.dg/template/canon-type-2.C: Likewise. * g++.dg/template/canon-type-3.C: Likewise. * g++.dg/template/canon-type-4.C: Likewise. * g++.dg/template/canon-type-5.C: Likewise. * g++.dg/template/canon-type-6.C: Likewise. * g++.dg/template/canon-type-7.C: Likewise. From-SVN: r147951
Diffstat (limited to 'gcc/cp/cvt.c')
-rw-r--r--gcc/cp/cvt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 3220fe6..596e81c 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -508,7 +508,7 @@ convert_from_reference (tree val)
{
if (TREE_CODE (TREE_TYPE (val)) == REFERENCE_TYPE)
{
- tree t = canonical_type_variant (TREE_TYPE (TREE_TYPE (val)));
+ tree t = TREE_TYPE (TREE_TYPE (val));
tree ref = build1 (INDIRECT_REF, t, val);
/* We *must* set TREE_READONLY when dereferencing a pointer to const,