diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2002-10-17 00:17:59 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2002-10-17 00:17:59 +0000 |
| commit | 2303a07914bc82ca17706fc15166bf40b940bfa7 (patch) | |
| tree | c40ac826896b3368eb3837dde85eb3dabae7beaf /gcc/cp/cvt.c | |
| parent | f9dd72da28d0932c200fb1885f350e9908186582 (diff) | |
| download | gcc-2303a07914bc82ca17706fc15166bf40b940bfa7.zip gcc-2303a07914bc82ca17706fc15166bf40b940bfa7.tar.gz gcc-2303a07914bc82ca17706fc15166bf40b940bfa7.tar.bz2 | |
re PR c++/7478 (internal compiler error on static_cast inside template)
PR c++/7478
* cvt.c (convert_to_reference): Allow references as the incoming
type.
PR c++/7478
* g++.dg/template/ref1.C: New test.
From-SVN: r58230
Diffstat (limited to 'gcc/cp/cvt.c')
| -rw-r--r-- | gcc/cp/cvt.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 6905a049e..7e31045 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -473,12 +473,13 @@ convert_to_reference (reftype, expr, convtype, flags, decl) tree decl; { register tree type = TYPE_MAIN_VARIANT (TREE_TYPE (reftype)); - register tree intype = TREE_TYPE (expr); + register tree intype; tree rval = NULL_TREE; tree rval_as_conversion = NULL_TREE; int i; - if (TREE_CODE (type) == FUNCTION_TYPE && intype == unknown_type_node) + if (TREE_CODE (type) == FUNCTION_TYPE + && TREE_TYPE (expr) == unknown_type_node) { expr = instantiate_type (type, expr, (flags & LOOKUP_COMPLAIN) @@ -488,6 +489,11 @@ convert_to_reference (reftype, expr, convtype, flags, decl) intype = TREE_TYPE (expr); } + else + { + expr = convert_from_reference (expr); + intype = TREE_TYPE (expr); + } my_friendly_assert (TREE_CODE (intype) != REFERENCE_TYPE, 364); |