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

re PR java/18697 (Miscompilation of GtkMenuItemPeer.setParent(MenuItem)) 

2004-12-03  Andrew Haley  <aph@redhat.com>

	PR java/18697
	* class.c (layout_class_method): Don't fail to override a method
	simply because it has DECL_ARTIFICIAL set.

From-SVN: r91689
This commit is contained in:
Andrew Haley 2004-12-03 18:01:59 +00:00 committed by Andrew Haley
parent 5edea4c664
commit 3381c28f38
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/java/ChangeLog
View File

@ -1,3 +1,9 @@
2004-12-03 Andrew Haley <aph@redhat.com>
PR java/18697
* class.c (layout_class_method): Don't fail to override a method
simply because it has DECL_ARTIFICIAL set.
2004-12-02 Tom Tromey <tromey@redhat.com>
PR java/16675:

6
gcc/java/class.c
View File

@ -2338,8 +2338,7 @@ layout_class_method (tree this_class, tree super_class,
tree super_method = lookup_argument_method (super_class, method_name,
method_sig);
if (super_method != NULL_TREE
&& ! METHOD_DUMMY (super_method)
&& ! DECL_ARTIFICIAL (super_method))
&& ! METHOD_DUMMY (super_method))
{
method_override = true;
if (! METHOD_PUBLIC (super_method) &&
@ -2358,7 +2357,8 @@ layout_class_method (tree this_class, tree super_class,
tree method_index = get_method_index (super_method);
set_method_index (method_decl, method_index);
if (method_index == NULL_TREE
&& !CLASS_FROM_SOURCE_P (this_class))
&& !CLASS_FROM_SOURCE_P (this_class)
&& ! DECL_ARTIFICIAL (super_method))
error ("%Jnon-static method '%D' overrides static method",
method_decl, method_decl);
}