From d768a5895b5949df369fec4e91d7923ba7097261 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Thu, 17 Oct 2002 17:07:15 +0000 Subject: [PATCH] pt.c (convert_template_argument): Revert this change: 2002-10-16 Mark Mitchell * pt.c (convert_template_argument): Revert this change: 2002-10-16 Mark Mitchell * pt.c (convert_template_argument): Do not fold non-type template rguments when inside a template. * g++.dg/abi/mangle17.C: Adjust. From-SVN: r58251 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 5 ++--- gcc/testsuite/ChangeLog | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 32348833032..4f0b230a962 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2002-10-17 Mark Mitchell + * pt.c (convert_template_argument): Revert this change: + 2002-10-16 Mark Mitchell + * pt.c (convert_template_argument): Do not fold non-type + template rguments when inside a template. + * init.c (expand_default_init): Handle brace-enclosed initializers correctly. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 046294e1486..ceff84f0a06 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -3487,11 +3487,10 @@ convert_template_argument (parm, arg, args, complain, i, in_decl) if (invalid_nontype_parm_type_p (t, complain)) return error_mark_node; - if (processing_template_decl && !abi_version_at_least (2)) + if (processing_template_decl) arg = maybe_fold_nontype_arg (arg); - if ((!abi_version_at_least (2) || !processing_template_decl) - && (!uses_template_parms (arg) && !uses_template_parms (t))) + if (!uses_template_parms (arg) && !uses_template_parms (t)) /* We used to call digest_init here. However, digest_init will report errors, which we don't want when complain is zero. More importantly, digest_init will try too diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 75bf1695f83..a7fd3521be6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,7 @@ 2002-10-17 Mark Mitchell + * g++.dg/abi/mangle17.C: Adjust. + * g++.dg/init/array8.C: New test. 2002-10-17 Richard Sandiford -- 2.30.2