ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

exception handler selection bugfixes

Browse Source
This commit is contained in:
Joel Dice 2007-07-04 20:44:01 -06:00
parent d2ef4dabc4
commit 56467e61d7
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/vm.cpp
View File

@ -4584,19 +4584,26 @@ run(Thread* t)
if (eht) { if (eht) {
for (unsigned i = 0; i < exceptionHandlerTableLength(t, eht); ++i) { for (unsigned i = 0; i < exceptionHandlerTableLength(t, eht); ++i) {
ExceptionHandler* eh = exceptionHandlerTableBody(t, eht, i); ExceptionHandler* eh = exceptionHandlerTableBody(t, eht, i);
object catchType = if (frameIp(t, frame) >= exceptionHandlerStart(eh)
arrayBody(t, codePool(t, code), exceptionHandlerCatchType(eh) - 1); and frameIp(t, frame) >= exceptionHandlerEnd(eh))
if (catchType == 0 or
(objectClass(t, catchType)
== arrayBody(t, t->vm->types, Machine::ClassType) and
instanceOf(t, catchType, exception)))
{ {
sp = frameStackBase(t, frame); object catchType = 0;
ip = exceptionHandlerIp(eh); if (exceptionHandlerCatchType(eh)) {
pushObject(t, exception); catchType = arrayBody
exception = 0; (t, codePool(t, code), exceptionHandlerCatchType(eh) - 1);
goto loop; }
if (catchType == 0 or
(objectClass(t, catchType)
== arrayBody(t, t->vm->types, Machine::ClassType) and
instanceOf(t, catchType, exception)))
{
sp = frameStackBase(t, frame);
ip = exceptionHandlerIp(eh);
pushObject(t, exception);
exception = 0;
goto loop;
}
} }
} }
} }