OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/22621 (Member function overloading introduces syntax errors) 

PR c++/22621
	* parser.c (cp_parser_template_argument): Don't turn "T::f" into
	"(*this).T::f".
	* pt.c (convert_nontype_argument): Remove ??? comment.

	PR c++/22621
	* g++.dg/template/overload5.C : New test.

From-SVN: r104881
This commit is contained in:
Mark Mitchell 2005-10-02 21:58:08 +00:00 committed by Mark Mitchell
parent cc86dcfb99
commit 2c164de609
5 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,5 +1,10 @@
2005-10-02 Mark Mitchell <mark@codesourcery.com>
PR c++/22621
* parser.c (cp_parser_template_argument): Don't turn "T::f" into
"(*this).T::f".
* pt.c (convert_nontype_argument): Remove ??? comment.
PR c++/23840
* tree.c (lvalue_p1): A VA_ARG_EXPR with class type is an lvalue,
when class rvalues are lvalues.

13
gcc/cp/parser.c
View File

@ -9099,11 +9099,20 @@ cp_parser_template_argument (cp_parser* parser)
argument = TREE_OPERAND (argument, 0);
}
if (qualifying_class)
/* If ADDRESS_P, then we use finish_qualified_id_expr so
that we get a pointer-to-member, if appropriate.
However, if ADDRESS_P is false, we don't want to turn
"T::f" into "(*this).T::f". */
if (qualifying_class && address_p)
argument = finish_qualified_id_expr (qualifying_class,
argument,
/*done=*/true,
address_p);
/*address_p=*/true);
else if (TREE_CODE (argument) == BASELINK)
/* We don't need the information about what class was used
to name the overloaded functions. */
argument = BASELINK_FUNCTIONS (argument);
if (TREE_CODE (argument) == VAR_DECL)
{
/* A variable without external linkage might still be a

4
gcc/cp/pt.c
View File

@ -3613,9 +3613,7 @@ convert_nontype_argument (tree type, tree expr)
else if (TYPE_PTRFN_P (type))
{
/* If the argument is a template-id, we might not have enough
context information to decay the pointer.
??? Why static5.C requires decay and subst1.C works fine
even without it? */
context information to decay the pointer. */
if (!type_unknown_p (expr_type))
{
expr = decay_conversion (expr);

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2005-10-02 Mark Mitchell <mark@codesourcery.com>
PR c++/22621
* g++.dg/template/overload5.C : New test.
PR c++/23840
* g++.dg/expr/stdarg1.C: New test.

28
gcc/testsuite/g++.dg/template/overload5.C Normal file
View File

@ -0,0 +1,28 @@
// PR c++/22621
struct foo {
typedef int (*fun)(int);
static int f(int); // overload between static & non-static
int f();
static int g(int); // non-overloaded static
};
template<foo::fun>
struct f_obj {
// something ..
};
f_obj<&foo::f> a; // OK
f_obj<foo::f> b; // OK (note: a and b are of the same type)
int foo::f()
{
f_obj<&foo::f> a; // OK
f_obj<foo::f> b; // ERROR: foo::f cannot be a constant expression
f_obj<&foo::g> c; // OK
f_obj<foo::g> d; // OK
}