mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 17:40:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/21614 (wrong code when calling member function of undefined class)

Browse Source 
PR c++/21614
	* typeck.c (get_member_function_from_ptrfunc): Do not attempt
	conversions to base classes of incomplete types.

	PR c++/21614
	* g++.dg/expr/ptrmem6.C: New test.
	* g++.dg/expr/ptrmem6a.C: Likewise.

From-SVN: r100291
This commit is contained in:
Mark Mitchell 2005-05-28 02:21:30 +00:00 committed by Mark Mitchell
parent ed3d0b1412
commit 81ae598bbd
5 changed files with 49 additions and 7 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 @@
2005-05-27 Mark Mitchell <mark@codesourcery.com>
PR c++/21614
* typeck.c (get_member_function_from_ptrfunc): Do not attempt
conversions to base classes of incomplete types.
2005-05-27 Ian Lance Taylor <ian@airs.com>
* semantics.c (add_stmt): Add C++ frontend specific version.

23
gcc/cp/typeck.c
View File

@ -2346,14 +2346,23 @@ get_member_function_from_ptrfunc (tree *instance_ptrptr, tree function)
gcc_unreachable ();
}
/* Convert down to the right base before using the instance. First
use the type... */
/* Convert down to the right base before using the instance. A
special case is that in a pointer to member of class C, C may
be incomplete. In that case, the function will of course be
a member of C, and no conversion is required. In fact,
lookup_base will fail in that case, because incomplete
classes do not have BINFOs. */
basetype = TYPE_METHOD_BASETYPE (TREE_TYPE (fntype));
basetype = lookup_base (TREE_TYPE (TREE_TYPE (instance_ptr)),
basetype, ba_check, NULL);
instance_ptr = build_base_path (PLUS_EXPR, instance_ptr, basetype, 1);
if (instance_ptr == error_mark_node)
return error_mark_node;
if (!same_type_ignoring_top_level_qualifiers_p
(basetype, TREE_TYPE (TREE_TYPE (instance_ptr))))
{
basetype = lookup_base (TREE_TYPE (TREE_TYPE (instance_ptr)),
basetype, ba_check, NULL);
instance_ptr = build_base_path (PLUS_EXPR, instance_ptr, basetype,
1);
if (instance_ptr == error_mark_node)
return error_mark_node;
}
/* ...and then the delta in the PMF. */
instance_ptr = build2 (PLUS_EXPR, TREE_TYPE (instance_ptr),
instance_ptr, delta);

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2005-05-27 Mark Mitchell <mark@codesourcery.com>
PR c++/21614
* g++.dg/expr/ptrmem6.C: New test.
* g++.dg/expr/ptrmem6a.C: Likewise.
2005-05-27 Kazu Hirata <kazu@cs.umass.edu>
PR tree-optimization/21658

12
gcc/testsuite/g++.dg/expr/ptrmem6.C Normal file
View File

@ -0,0 +1,12 @@
// PR C++/21614
// { dg-additional-sources "ptrmem6a.C" }
// { dg-do run }
extern struct Z *p;
extern int (Z::*m) ();
int main () {
if ((p->*m)() == 7)
return 0;
return 1;
}

9
gcc/testsuite/g++.dg/expr/ptrmem6a.C Normal file
View File

@ -0,0 +1,9 @@
struct Z {
int f();
};
int Z::f() { return 7; }
struct Z z;
int (Z::*m)() = &Z::f;
struct Z*p = &z;