procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pt.c (lookup_template_class): push_tinst_level around call to coerce_template_parms.

Browse source 
* pt.c (lookup_template_class): push_tinst_level around call to
	coerce_template_parms.

From-SVN: r165974
This commit is contained in:
Jason Merrill 2010-10-26 13:57:30 -04:00 • committed by Jason Merrill
parent 2c80712872
commit 701c0df13e
4 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/ChangeLog
View file

@ -1,5 +1,8 @@
2010-10-26 Jason Merrill <jason@redhat.com>
* pt.c (lookup_template_class): push_tinst_level around call to
coerce_template_parms.
* tree.c (stabilize_expr): Handle xvalues properly.
* call.c (build_over_call): Use argarray[0] for 'this' argument.

18
gcc/cp/pt.c
View file

@ -6595,13 +6595,17 @@ lookup_template_class (tree d1,
arglist = bound_args;
}
else
arglist
= coerce_template_parms (INNERMOST_TEMPLATE_PARMS (parmlist),
INNERMOST_TEMPLATE_ARGS (arglist),
gen_tmpl,
complain,
/*require_all_args=*/true,
/*use_default_args=*/true);
{
push_tinst_level (templ);
arglist
= coerce_template_parms (INNERMOST_TEMPLATE_PARMS (parmlist),
INNERMOST_TEMPLATE_ARGS (arglist),
gen_tmpl,
complain,
/*require_all_args=*/true,
/*use_default_args=*/true);
pop_tinst_level ();
}
if (arglist == error_mark_node)
/* We were unable to bind the arguments. */

4
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,7 @@
2010-10-26 Jason Merrill <jason@redhat.com>
* g++.dg/template/arg8.C: Test for helpful diagnostic.
2010-10-26 Janus Weil <janus@gcc.gnu.org>
PR fortran/42647

12
gcc/testsuite/g++.dg/template/arg8.C Normal file
View file

@ -0,0 +1,12 @@
// Test for a message indicating what template we're trying to convert
// arguments for. We can't actually test for it directly because it
// doesn't have an associated line number, but we can test for the
// "instantiated from here" message that follows.
template <int I>
struct A { };
int i;
A<i> a; // { dg-message "instantiated from here" }
// { dg-error "not a valid template argument" "" { target *-*-* } 10 }
// { dg-error "invalid type in declaration" "" { target *-*-* } 10 }