ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix handling of call target resolution for non-virtual calls

Browse Source
This commit is contained in:
Joel Dice 2008-01-11 15:16:24 -07:00
parent a56c0ad2ef
commit f0d556b0ec
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/compile.cpp
View File

@ -73,7 +73,7 @@ class MyThread: public Thread {
object object
resolveTarget(MyThread* t, void* stack, object method) resolveTarget(MyThread* t, void* stack, object method)
{ {
if (method and methodVirtual(t, method)) { if (method) {
unsigned parameterFootprint = methodParameterFootprint(t, method); unsigned parameterFootprint = methodParameterFootprint(t, method);
object class_ = objectClass object class_ = objectClass
@ -143,7 +143,10 @@ class MyStackWalker: public Processor::StackWalker {
static object resolveNativeMethod(MyThread* t, void* stack, object node) { static object resolveNativeMethod(MyThread* t, void* stack, object node) {
if (node) { if (node) {
object target = resolveTarget(t, stack, traceNodeTarget(t, node)); object target = traceNodeTarget(t, node);
if (traceNodeVirtualCall(t, node)) {
target = resolveTarget(t, stack, target);
}
if (target and methodFlags(t, target) & ACC_NATIVE) { if (target and methodFlags(t, target) & ACC_NATIVE) {
return target; return target;
} }
@ -2611,9 +2614,21 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip)
object target = resolveMethod(t, codePool(t, code), index - 1); object target = resolveMethod(t, codePool(t, code), index - 1);
if (UNLIKELY(t->exception)) return; if (UNLIKELY(t->exception)) return;
object class_ = methodClass(t, target); fprintf
(stderr, "invokespecial (1) %s.%s%s\n",
&byteArrayBody(t, className(t, methodClass(t, target)), 0),
&byteArrayBody(t, methodName(t, target), 0),
&byteArrayBody(t, methodSpec(t, target), 0));
object class_ = methodClass(t, context->method);
if (isSpecialMethod(t, target, class_)) { if (isSpecialMethod(t, target, class_)) {
target = findMethod(t, target, classSuper(t, class_)); target = findMethod(t, target, classSuper(t, class_));
fprintf
(stderr, "invokespecial (2) %s.%s%s\n",
&byteArrayBody(t, className(t, methodClass(t, target)), 0),
&byteArrayBody(t, methodName(t, target), 0),
&byteArrayBody(t, methodSpec(t, target), 0));
} }
compileDirectInvoke(t, frame, target); compileDirectInvoke(t, frame, target);
@ -3820,7 +3835,7 @@ compileMethod2(MyThread* t)
PROTECT(t, target); PROTECT(t, target);
if (traceNodeVirtualCall(t, node)) { if (traceNodeVirtualCall(t, node)) {
target = resolveTarget(t, t->stack, traceNodeTarget(t, node)); target = resolveTarget(t, t->stack, target);
} }
if (LIKELY(t->exception == 0)) { if (LIKELY(t->exception == 0)) {
@ -3857,6 +3872,8 @@ invokeNative2(MyThread* t, object method)
{ {
PROTECT(t, method); PROTECT(t, method);
assert(t, methodFlags(t, method) & ACC_NATIVE);
initClass(t, methodClass(t, method)); initClass(t, methodClass(t, method));
if (UNLIKELY(t->exception)) return 0; if (UNLIKELY(t->exception)) return 0;
@ -4020,7 +4037,10 @@ uint64_t FORCE_ALIGN
invokeNative(MyThread* t) invokeNative(MyThread* t)
{ {
object node = findTraceNode(t, *static_cast<void**>(t->stack)); object node = findTraceNode(t, *static_cast<void**>(t->stack));
object target = resolveTarget(t, t->stack, traceNodeTarget(t, node)); object target = traceNodeTarget(t, node);
if (traceNodeVirtualCall(t, node)) {
target = resolveTarget(t, t->stack, target);
}
uint64_t result = 0; uint64_t result = 0;
if (LIKELY(t->exception == 0)) { if (LIKELY(t->exception == 0)) {

8
test/Misc.java
View File

@ -46,7 +46,14 @@ public class Misc {
putInt((int)val, dst, offset + 4); putInt((int)val, dst, offset + 4);
} }
public String toString() {
return super.toString();
}
public static void main(String[] args) { public static void main(String[] args) {
Misc m = new Misc();
m.toString();
expect(Long.valueOf(231L) == 231L); expect(Long.valueOf(231L) == 231L);
long x = 231; long x = 231;
@ -82,7 +89,6 @@ public class Misc {
int b = 2; int b = 2;
int c = a + b; int c = a + b;
Misc m = new Misc();
String s = "hello"; String s = "hello";
m.foo(s); m.foo(s);
m.bar(s); m.bar(s);