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

natClass.cc (_Jv_LayoutVTableMethods): Always assign a vtable slot for final methods. 

* java/lang/natClass.cc (_Jv_LayoutVTableMethods): Always assign a
	vtable slot for final methods. Add FIXME comment.

From-SVN: r73023
This commit is contained in:
Bryce McKinlay 2003-10-28 22:45:57 +00:00 committed by Bryce McKinlay
parent e2d0915cc9
commit 6ac8b2b187
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2003-10-28 Bryce McKinlay <bryce@mckinlay.net.nz>
* java/lang/natClass.cc (_Jv_LayoutVTableMethods): Always assign a
vtable slot for final methods. Add FIXME comment.
2003-10-28 David S. Miller <davem@redhat.com>
* sysdep/sparc/locks.h (__cas_start_atomic): %g0 --> %%g0.

9
libjava/java/lang/natClass.cc
View File

@ -1835,6 +1835,12 @@ _Jv_LayoutVTableMethods (jclass klass)
if (! _Jv_isVirtualMethod (meth))
continue;
// FIXME: Must check that we don't override:
// - Package-private method where superclass is in different package.
// - Final or less-accessible declaration in superclass (check binary
// spec, do we allocate new vtable entry or put throw node in vtable?)
// - Static or private method in superclass.
if (superclass != NULL)
{
super_meth = _Jv_LookupDeclaredMethod (superclass, meth->name,
@ -1843,8 +1849,7 @@ _Jv_LayoutVTableMethods (jclass klass)
if (super_meth)
meth->index = super_meth->index;
else if (! (meth->accflags & java::lang::reflect::Modifier::FINAL)
&& ! (klass->accflags & java::lang::reflect::Modifier::FINAL))
else
meth->index = index++;
}