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

re PR c++/48838 (valid template code does not compile)

Browse source 
Fix PR c++/48838

gcc/cp

	PR c++/48838
	* cp-tree.h (non_static_member_function_p): Declare new function.
	* tree.c (non_static_member_function_p): Define it.
	* semantics.c (finish_call_expr): Use it.

gcc/testsuite

	PR c++/48838
	* g++.dg/template/member9.C: New test case.

From-SVN: r173473
This commit is contained in:
Dodji Seketeli 2011-05-06 08:34:53 +00:00 • committed by Dodji Seketeli
parent 155b61760d
commit 73452ce79a
6 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/cp/ChangeLog
View file

@ -1,3 +1,10 @@
2011-05-06 Dodji Seketeli <dodji@redhat.com>
PR c++/48838
* cp-tree.h (non_static_member_function_p): Declare new function.
* tree.c (non_static_member_function_p): Define it.
* semantics.c (finish_call_expr): Use it.
2011-05-05 Nathan Froyd <froydnj@codesourcery.com>
* decl.c (finish_case_label): Omit the loc argument to

1
gcc/cp/cp-tree.h
View file

@ -5432,6 +5432,7 @@ extern tree get_fns (tree);
extern tree get_first_fn (tree);
extern tree ovl_cons (tree, tree);
extern tree build_overload (tree, tree);
extern bool non_static_member_function_p (tree);
extern const char *cxx_printable_name (tree, int);
extern const char *cxx_printable_name_translate (tree, int);
extern tree build_exception_variant (tree, tree);

3
gcc/cp/semantics.c
View file

@ -2039,8 +2039,7 @@ finish_call_expr (tree fn, VEC(tree,gc) **args, bool disallow_virtual,
is not included in *ARGS even though it is considered to
be part of the list of arguments. Note that this is
related to CWG issues 515 and 1005. */
|| (((TREE_CODE (TREE_TYPE (fn)) == METHOD_TYPE)
|| BASELINK_P (fn))
|| (non_static_member_function_p (fn)
&& current_class_ref
&& type_dependent_expression_p (current_class_ref)))
{

16
gcc/cp/tree.c
View file

@ -1480,6 +1480,22 @@ build_overload (tree decl, tree chain)
return ovl_cons (decl, chain);
}
/* Return TRUE if FN is a non-static member function, FALSE otherwise.
This function looks into BASELINK and OVERLOAD nodes. */
bool
non_static_member_function_p (tree fn)
{
if (fn == NULL_TREE)
return false;
if (is_overloaded_fn (fn))
fn = get_first_fn (fn);
return (DECL_P (fn)
&& DECL_NONSTATIC_MEMBER_FUNCTION_P (fn));
}
#define PRINT_RING_SIZE 4

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2011-05-06 Dodji Seketeli <dodji@redhat.com>
PR c++/48838
* g++.dg/template/member9.C: New test case.
2011-05-05 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/discr29.ad[sb]: New test.

21
gcc/testsuite/g++.dg/template/member9.C Normal file
View file

@ -0,0 +1,21 @@
// Origin PR c++/48838
// { dg-do compile }
class DUChainItemSystem
{
public:
template<class T>
void registerTypeClass();
static DUChainItemSystem& self();
};
template<class T>
struct DUChainItemRegistrator
{
DUChainItemRegistrator()
{
DUChainItemSystem::self().registerTypeClass<T>();
}
};