ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

handle redundant, unreachable gotos in JIT compiler

Browse Source 
I recently encountered a Batik JAR with a method containing a
redundant goto which confused the JIT compiler because it was refered
to in the exception handler and line number tables despite being
unreachable.  I don't know how such code was generated, but this
commit ensures the compiler can handle it.
This commit is contained in:
Joel Dice 2011-03-25 18:55:25 -06:00
parent 639ef50079
commit 31eb047391
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/compile.cpp
View File

@ -5875,6 +5875,25 @@ logCompile(MyThread* t, const void* code, unsigned size, const char* class_,
} }
} }
unsigned
resolveIp(MyThread* t, object code, unsigned ip)
{
switch (codeBody(t, code, ip)) {
case goto_: {
unsigned tmp = ip + 1;
return ip + codeReadInt16(t, code, tmp);
}
case goto_w: {
unsigned tmp = ip + 1;
return ip + codeReadInt32(t, code, tmp);
}
default:
return ip;
}
}
object object
translateExceptionHandlerTable(MyThread* t, Compiler* c, object method, translateExceptionHandlerTable(MyThread* t, Compiler* c, object method,
intptr_t start) intptr_t start)
@ -5900,7 +5919,10 @@ translateExceptionHandlerTable(MyThread* t, Compiler* c, object method,
(t, oldTable, i); (t, oldTable, i);
intArrayBody(t, newIndex, i * 3) intArrayBody(t, newIndex, i * 3)
= c->machineIp(exceptionHandlerStart(oldHandler))->value() - start; = c->machineIp
(resolveIp
(t, methodCode(t, method),
exceptionHandlerStart(oldHandler)))->value() - start;
intArrayBody(t, newIndex, (i * 3) + 1) intArrayBody(t, newIndex, (i * 3) + 1)
= c->machineIp(exceptionHandlerEnd(oldHandler))->value() - start; = c->machineIp(exceptionHandlerEnd(oldHandler))->value() - start;
@ -5940,7 +5962,8 @@ translateLineNumberTable(MyThread* t, Compiler* c, object code, intptr_t start)
LineNumber* newLine = lineNumberTableBody(t, newTable, i); LineNumber* newLine = lineNumberTableBody(t, newTable, i);
lineNumberIp(newLine) lineNumberIp(newLine)
= c->machineIp(lineNumberIp(oldLine))->value() - start; = c->machineIp(resolveIp(t, code, lineNumberIp(oldLine)))->value()
- start;
lineNumberLine(newLine) = lineNumberLine(oldLine); lineNumberLine(newLine) = lineNumberLine(oldLine);
} }
@ -6842,7 +6865,8 @@ compile(MyThread* t, Context* context)
c->restoreState(state); c->restoreState(state);
ExceptionHandler* eh = exceptionHandlerTableBody(t, eht, i); ExceptionHandler* eh = exceptionHandlerTableBody(t, eht, i);
unsigned start = exceptionHandlerStart(eh); unsigned start = resolveIp
(t, methodCode(t, context->method), exceptionHandlerStart(eh));
if ((not RUNTIME_ARRAY_BODY(visited)[i]) if ((not RUNTIME_ARRAY_BODY(visited)[i])
and context->visitTable[start]) and context->visitTable[start])
@ -7917,6 +7941,17 @@ invoke(Thread* thread, object method, ArgumentList* arguments)
{ {
MyThread* t = static_cast<MyThread*>(thread); MyThread* t = static_cast<MyThread*>(thread);
if (false) {
PROTECT(t, method);
compile(t, local::codeAllocator(static_cast<MyThread*>(t)), 0,
resolveMethod
(t, root(t, Machine::AppLoader),
"foo/ClassName",
"methodName",
"()V"));
}
uintptr_t stackLimit = t->stackLimit; uintptr_t stackLimit = t->stackLimit;
uintptr_t stackPosition = reinterpret_cast<uintptr_t>(&t); uintptr_t stackPosition = reinterpret_cast<uintptr_t>(&t);
if (stackLimit == 0) { if (stackLimit == 0) {