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

fix crash when AOT compiling switch statement with only a default case

Browse Source 
The existing code handled such odd switch statements correctly in the
JIT case, but did the wrong thing for the AOT case, leading to an
assertion failure later on.
This commit is contained in:
Joel Dice 2012-07-19 13:26:06 -06:00
parent 59280c5780
commit 265ab63e19
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compile.cpp
View File

@ -5527,12 +5527,12 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
uint32_t defaultIp = base + codeReadInt32(t, code, ip);
assert(t, defaultIp < codeLength(t, code));
Compiler::Operand* default_ = frame->addressOperand
(frame->addressPromise(c->machineIp(defaultIp)));
int32_t pairCount = codeReadInt32(t, code, ip);
if (pairCount) {
Compiler::Operand* default_ = frame->addressOperand
(frame->addressPromise(c->machineIp(defaultIp)));
Promise* start = 0;
THREAD_RUNTIME_ARRAY(t, uint32_t, ipTable, pairCount);
for (int32_t i = 0; i < pairCount; ++i) {
@ -5574,7 +5574,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
}
} else {
// a switch statement with no cases, apparently
c->jmp(default_);
c->jmp(frame->machineIp(defaultIp));
}
ip = defaultIp;