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

re PR c++/14688 (Mis-matched calling convention on virtual functions accepted without error)

Browse Source 
PR c++/14688
	* config/i386/i386.c (ix86_comp_type_attributes): Check
	METHOD_TYPE too.

cp
	* search.c (check_final_overrider): Fail if
	targetm.comp_type_attributes returns 0.

testsuite
	* g++.dg/inherit/override_attribs.C: New file.

From-SVN: r128740
This commit is contained in:
Danny Smith 2007-09-25 00:29:42 +00:00 committed by Danny Smith
parent 2e10488521
commit 18ff3013c2
6 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2007-09-24 Danny Smith <dannysmith@user.sourceforge.net>
PR c++/14688
* config/i386/i386.c (ix86_comp_type_attributes): Check
METHOD_TYPE too.
2007-09-24 Roman Zippel <zippel@linux-m68k.org>
* config/m68k/m68k.h (ASM_OUTPUT_ALIGN_WITH_NOP): New, use

4
gcc/config/i386/i386.c
View File

@ -3118,7 +3118,8 @@ ix86_comp_type_attributes (const_tree type1, const_tree type2)
/* Check for mismatch of non-default calling convention. */
const char *const rtdstr = TARGET_RTD ? "cdecl" : "stdcall";
if (TREE_CODE (type1) != FUNCTION_TYPE)
if (TREE_CODE (type1) != FUNCTION_TYPE
&& TREE_CODE (type1) != METHOD_TYPE)
return 1;
/* Check for mismatched fastcall/regparm types. */
@ -7839,6 +7840,7 @@ get_dllimport_decl (tree decl)
set_mem_alias_set (rtl, ix86_GOT_alias_set ());
SET_DECL_RTL (to, rtl);
SET_DECL_ASSEMBLER_NAME (to, get_identifier (name));
return to;
}

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,10 @@
2007-09-24 Danny Smith <dannysmith@user.sourceforge.net>
PR c++/14688
* search.c (check_final_overrider): Fail if
targetm.comp_type_attributes returns 0.
2007-09-24 Jason Merrill <jason@redhat.com>
PR c++/33239

10
gcc/cp/search.c
View File

@ -33,6 +33,7 @@ along with GCC; see the file COPYING3. If not see
#include "rtl.h"
#include "output.h"
#include "toplev.h"
#include "target.h"
static int is_subobject_of_p (tree, tree);
static tree dfs_lookup_base (tree, void *);
@ -1901,6 +1902,15 @@ check_final_overrider (tree overrider, tree basefn)
return 0;
}
/* Check for conflicting type attributes. */
if (!targetm.comp_type_attributes (over_type, base_type))
{
error ("conflicting type attributes specified for %q+#D", overrider);
error (" overriding %q+#D", basefn);
DECL_INVALID_OVERRIDER_P (overrider) = 1;
return 0;
}
return 1;
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2007-09-24 Danny Smith <dannysmith@user.sourceforge.net>
PR c++/14688
* g++.dg/inherit/override_attribs.C: New file.
2007-09-23 Tobias Schlüter <tobi@gcc.gnu.org>
PR fortran/33269

22
gcc/testsuite/g++.dg/inherit/override-attribs.C Normal file
View File

@ -0,0 +1,22 @@
// PR c++/14688
// { dg-do compile { target i?86-*-* } }
class one
{
public:
virtual void
test(void* value); // { dg-error "overriding" }
};
class two : public one
{
public:
void __attribute__((regparm(2)))
test(void* value); // { dg-error "conflicting type attributes" }
};
class three : public one
{
public:
void __attribute__ ((cdecl))
test(void* value); // OK
};