mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-05 14:59:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/10940 (Bad code with explicit specialization)

Browse Source 
PR c++/10940
	* pt.c (check_explicit_specialization): Check for 'static'
	earlier.

	* g++.dg/template/spec10.C: New test.

From-SVN: r67373
This commit is contained in:
Kriang Lerdsuwanakij 2003-06-03 13:01:44 +00:00 committed by Kriang Lerdsuwanakij
parent 075ec276a0
commit 6c07f44866
4 changed files with 50 additions and 10 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 @@
2003-06-03 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/10940
* pt.c (check_explicit_specialization): Check for 'static'
earlier.
2003-05-31 Diego Novillo <dnovillo@redhat.com>
* class.c (dump_array): Call CONSTRUCTOR_ELTS to access

22
gcc/cp/pt.c
View File

@ -1849,6 +1849,18 @@ check_explicit_specialization (declarator, decl, template_count, flags)
return instantiate_template (tmpl, targs, tf_error);
}
/* If we thought that the DECL was a member function, but it
turns out to be specializing a static member function,
make DECL a static member function as well. We also have
to adjust last_function_parms to avoid confusing
start_function later. */
if (DECL_STATIC_FUNCTION_P (tmpl)
&& DECL_NONSTATIC_MEMBER_FUNCTION_P (decl))
{
revert_static_member_fn (decl);
last_function_parms = TREE_CHAIN (last_function_parms);
}
/* If this is a specialization of a member template of a
template class. In we want to return the TEMPLATE_DECL,
not the specialization of it. */
@ -1865,16 +1877,6 @@ check_explicit_specialization (declarator, decl, template_count, flags)
return tmpl;
}
/* If we thought that the DECL was a member function, but it
turns out to be specializing a static member function,
make DECL a static member function as well. */
if (DECL_STATIC_FUNCTION_P (tmpl)
&& DECL_NONSTATIC_MEMBER_FUNCTION_P (decl))
{
revert_static_member_fn (decl);
last_function_parms = TREE_CHAIN (last_function_parms);
}
/* Set up the DECL_TEMPLATE_INFO for DECL. */
DECL_TEMPLATE_INFO (decl) = tree_cons (tmpl, targs, NULL_TREE);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2003-06-03 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/10940
* g++.dg/template/spec10.C: New test.
2003-06-03 Roger Sayle <roger@eyesopen.com>
* gcc.dg/builtins-16.c: New test case.

27
gcc/testsuite/g++.dg/template/spec10.C Normal file
View File

@ -0,0 +1,27 @@
// { dg-do run }
// Origin: Lynn Akers <lakers@peachtree.com>
// PR c++/10940: Problem handling parameter list for static member
// that is a specialization of a member template of a template class.
template<int b>
class o
{
public:
template<typename T> static void do_add(T* p, T v);
};
template<>
template<typename T>
inline void o<32>::do_add(T* p, T v)
{
*p += v;
}
int main()
{
int a = 0x1000;
o<32>().do_add<int>(&a, 0x2000);
return a;
}