ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-22 09:08:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

handle invokevirtual calls to non-virtual methods

Browse Source 
OpenJDK's sun.reflect.MethodAccessorGenerator can generate
invokevirtual calls to private methods (which we normally consider
non-virtual); we must compile them as non-virtual calls since they
aren't in the vtable.
This commit is contained in:
Joel Dice
2011-03-26 23:13:05 -06:00
parent 0f38673baa
commit d5ae053f11
1 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compile.cpp
View File

@ -4890,6 +4890,9 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
if (LIKELY(target)) { if (LIKELY(target)) {
assert(t, (methodFlags(t, target) & ACC_STATIC) == 0); assert(t, (methodFlags(t, target) & ACC_STATIC) == 0);
bool tailCall = isTailCall(t, code, ip, context->method, target);
if (LIKELY(methodVirtual(t, target))) {
unsigned parameterFootprint = methodParameterFootprint(t, target); unsigned parameterFootprint = methodParameterFootprint(t, target);
unsigned offset = ClassVtable unsigned offset = ClassVtable
@ -4899,8 +4902,6 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
unsigned rSize = resultSize(t, methodReturnCode(t, target)); unsigned rSize = resultSize(t, methodReturnCode(t, target));
bool tailCall = isTailCall(t, code, ip, context->method, target);
Compiler::Operand* result = c->stackCall Compiler::Operand* result = c->stackCall
(c->memory (c->memory
(c->and_ (c->and_
@ -4918,6 +4919,13 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
if (rSize) { if (rSize) {
pushReturnValue(t, frame, methodReturnCode(t, target), result); pushReturnValue(t, frame, methodReturnCode(t, target), result);
} }
} else {
// OpenJDK generates invokevirtual calls to private methods
// (e.g. readObject and writeObject for serialization), so
// we must handle such cases here.
compileDirectInvoke(t, frame, target, tailCall);
}
} else { } else {
PROTECT(t, reference); PROTECT(t, reference);