mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-23 03:39:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR c++/2862, c++/2863

Browse Source 
PR c++/2862, c++/2863
	* pt.c (determine_specialization): Compare the length of
	TYPE_ARG_TYPES.  Tidy.

	* g++.dg/template/instantiate2.C: New test.
	* g++.dg/template/spec4.C: New test.

From-SVN: r55527
This commit is contained in:
Kriang Lerdsuwanakij 2002-07-17 14:17:21 +00:00 committed by Kriang Lerdsuwanakij
parent d03d18e8de
commit d955f6ea6f
5 changed files with 68 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2002-07-17 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/2862, c++/2863
* pt.c (determine_specialization): Compare the length of
TYPE_ARG_TYPES. Tidy.
2002-07-17 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/3797

60
gcc/cp/pt.c
View File

@ -998,28 +998,58 @@ determine_specialization (template_id, decl, targs_out,
for (; fns; fns = OVL_NEXT (fns))
{
tree tmpl;
tree fn = OVL_CURRENT (fns);
if (TREE_CODE (fn) == TEMPLATE_DECL)
/* DECL might be a specialization of FN. */
tmpl = fn;
{
tree decl_arg_types;
/* DECL might be a specialization of FN. */
/* Adjust the type of DECL in case FN is a static member. */
decl_arg_types = TYPE_ARG_TYPES (TREE_TYPE (decl));
if (DECL_STATIC_FUNCTION_P (fn)
&& DECL_NONSTATIC_MEMBER_FUNCTION_P (decl))
decl_arg_types = TREE_CHAIN (decl_arg_types);
/* Check that the number of function parameters matches.
For example,
template <class T> void f(int i = 0);
template <> void f<int>();
The specialization f<int> is illegal but is not caught
by get_bindings below. */
if (list_length (TYPE_ARG_TYPES (TREE_TYPE (fn)))
!= list_length (decl_arg_types))
continue;
/* See whether this function might be a specialization of this
template. */
targs = get_bindings (fn, decl, explicit_targs);
if (!targs)
/* We cannot deduce template arguments that when used to
specialize TMPL will produce DECL. */
continue;
/* Save this template, and the arguments deduced. */
templates = tree_cons (targs, fn, templates);
}
else if (need_member_template)
/* FN is an ordinary member function, and we need a
specialization of a member template. */
continue;
;
else if (TREE_CODE (fn) != FUNCTION_DECL)
/* We can get IDENTIFIER_NODEs here in certain erroneous
cases. */
continue;
;
else if (!DECL_FUNCTION_MEMBER_P (fn))
/* This is just an ordinary non-member function. Nothing can
be a specialization of that. */
continue;
;
else if (DECL_ARTIFICIAL (fn))
/* Cannot specialize functions that are created implicitly. */
continue;
;
else
{
tree decl_arg_types;
@ -1055,21 +1085,7 @@ determine_specialization (template_id, decl, targs_out,
decl_arg_types))
/* They match! */
candidates = tree_cons (NULL_TREE, fn, candidates);
continue;
}
/* See whether this function might be a specialization of this
template. */
targs = get_bindings (tmpl, decl, explicit_targs);
if (!targs)
/* We cannot deduce template arguments that when used to
specialize TMPL will produce DECL. */
continue;
/* Save this template, and the arguments deduced. */
templates = tree_cons (targs, tmpl, templates);
}
if (templates && TREE_CHAIN (templates))

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2002-07-17 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
* g++.dg/template/instantiate2.C: New test.
* g++.dg/template/spec4.C: New test.
2002-07-17 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
* g++.dg/template/access2.C: New test.

8
gcc/testsuite/g++.dg/template/instantiate2.C Normal file
View File

@ -0,0 +1,8 @@
// { dg-do compile }
// Origin: Wolfgang Bangerth <wolfgang.bangerth@iwr.uni-heidelberg.de>
// PR c++/2862
// Default function argument and template instantiation.
template <int dim> void f (int=0) {};
template void f<1> (); // { dg-error "not match" }

11
gcc/testsuite/g++.dg/template/spec4.C Normal file
View File

@ -0,0 +1,11 @@
// { dg-do compile }
// Origin: Wolfgang Bangerth <wolfgang.bangerth@iwr.uni-heidelberg.de>
// PR c++/2863
// Default function argument and template specialization.
struct X {
template <int dim> void f(int=0);
};
template <> void X::f<1> () {} // { dg-error "(not match|syntax error)" }