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

add assert in Compiler::initLocal and fix ensuing problems

Browse Source
This commit is contained in:
Joshua Warner 2014-05-03 22:14:49 -06:00 committed by Joshua Warner
parent 9a54c50db6
commit b6a3ed763c
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/codegen/compiler.cpp
View File

@ -2471,10 +2471,28 @@ class MyCompiler: public Compiler {
appendReturn(&c, 0); appendReturn(&c, 0);
} }
void initLocalPart(unsigned index, ir::Type type)
{
Value* v = value(&c, type);
if (DebugFrame) {
fprintf(stderr,
"init local %p at %d (%d)\n",
v,
index,
frameIndex(&c, index));
}
appendFrameSite(&c, v, frameIndex(&c, index));
Local* local = c.locals + index;
local->value = v;
v->home = frameIndex(&c, index);
}
virtual void initLocal(unsigned footprint, unsigned index, ir::Type type) virtual void initLocal(unsigned footprint, unsigned index, ir::Type type)
{ {
// TODO: enable the following assertion when possible: assert(&c, footprint == typeFootprint(&c, type));
// assert(&c, footprint == typeFootprint(type));
assert(&c, index + footprint <= c.localFootprint); assert(&c, index + footprint <= c.localFootprint);
Value* v = value(&c, type); Value* v = value(&c, type);
@ -2493,7 +2511,7 @@ class MyCompiler: public Compiler {
} }
if (TargetBytesPerWord == 4) { if (TargetBytesPerWord == 4) {
initLocal(1, highIndex, type); initLocalPart(highIndex, type);
Value* next = c.locals[highIndex].value; Value* next = c.locals[highIndex].value;
v->nextWord = next; v->nextWord = next;
next->nextWord = v; next->nextWord = v;
@ -2527,7 +2545,7 @@ class MyCompiler: public Compiler {
for (int i = 0; i < static_cast<int>(c.localFootprint); ++i) { for (int i = 0; i < static_cast<int>(c.localFootprint); ++i) {
Local* local = e->locals() + i; Local* local = e->locals() + i;
if (local->value) { if (local->value) {
initLocal(1, i, local->value->type); initLocalPart(i, local->value->type);
} }
} }