diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/array13.C | 14 |
4 files changed, 28 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7986946..0665b65 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2005-03-09 Mark Mitchell <mark@codesourcery.com> + + PR c++/20208 + * pt.c (tsubst_decl): Apply array-to-pointer and + function-to-pointer conversions to function arguments. + (regenerate_decl_from_template): Likewise. + 2005-03-09 Paolo Carlini <pcarlini@suse.de> PR c++/16859 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 320cd84..2ad20b34a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6515,6 +6515,7 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain) SET_DECL_TEMPLATE_PARM_P (r); type = tsubst (TREE_TYPE (t), args, complain, in_decl); + type = type_decays_to (type); TREE_TYPE (r) = type; cp_apply_type_quals_to_decl (cp_type_quals (type), r); @@ -11136,6 +11137,7 @@ regenerate_decl_from_template (tree decl, tree tmpl) DECL_NAME (decl_parm) = DECL_NAME (pattern_parm); parm_type = tsubst (TREE_TYPE (pattern_parm), args, tf_error, NULL_TREE); + parm_type = type_decays_to (parm_type); if (!same_type_p (TREE_TYPE (decl_parm), parm_type)) TREE_TYPE (decl_parm) = parm_type; decl_parm = TREE_CHAIN (decl_parm); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8e35721..fd38a0e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-03-09 Mark Mitchell <mark@codesourcery.com> + + PR c++/20208 + * g++.dg/template/array13.C: New test. + 2005-03-09 Paolo Carlini <pcarlini@suse.de> PR c++/16859 diff --git a/gcc/testsuite/g++.dg/template/array13.C b/gcc/testsuite/g++.dg/template/array13.C new file mode 100644 index 0000000..3bc152c --- /dev/null +++ b/gcc/testsuite/g++.dg/template/array13.C @@ -0,0 +1,14 @@ +// PR c++/20208 +// { dg-do run } +// { dg-options "-O2" } + +extern "C" void abort(); + +template <typename T> +inline void *Foo (T arg) { return &arg[0]; } + +int main () { + int bry[2]; + if (Foo<int[2]>(bry) != bry) + abort(); +} |