ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 11:16:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

re-initialize frame maps for exception handlers on every iteration of the frame map calculation loop

Browse Source 
This fixes incorrect frame map calcuation which may lead to crashes
during garbage collection from an exception handler.
This commit is contained in:
Joel Dice 2009-06-16 13:41:31 -06:00
parent a21f951e29
commit 7ed14948b9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/compile.cpp
View File

@ -548,6 +548,7 @@ enum Event {
IpEvent,
MarkEvent,
ClearEvent,
InitEvent,
TraceEvent
};
@ -4388,6 +4389,14 @@ calculateFrameMaps(MyThread* t, Context* context, uintptr_t* originalRoots,
clearBit(roots, i);
} break;
case InitEvent: {
unsigned reference = context->eventLog.get2(eventIndex);
eventIndex += 2;
uintptr_t* tableRoots = context->rootTable + (reference * mapSize);
memcpy(roots, tableRoots, mapSize * BytesPerWord);
} break;
case TraceEvent: {
TraceElement* te; context->eventLog.get(eventIndex, &te, BytesPerWord);
if (DebugFrameMaps) {
@ -4711,16 +4720,8 @@ compile(MyThread* t, Allocator* allocator, Context* context)
uint8_t stackMap[codeMaxStack(t, methodCode(t, context->method))];
Frame frame2(&frame, stackMap);
uintptr_t* roots = context->rootTable
+ (start * frameMapSizeInWords(t, context->method));
for (unsigned i = 0; i < localSize(t, context->method); ++ i) {
if (getBit(roots, i)) {
frame2.set(i, Frame::Object);
} else {
frame2.set(i, Frame::Integer);
}
}
context->eventLog.append(InitEvent);
context->eventLog.append2(start);
for (unsigned i = 1;
i < codeMaxStack(t, methodCode(t, context->method));