mirror of
https://github.com/corda/corda.git
synced 2025-01-08 14:03:06 +00:00
clean up subroutine code in wake of merge from master branch
This commit is contained in:
parent
9b6d4fdeab
commit
92a8a4d83b
@ -2911,7 +2911,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
|
|||||||
// wasn't already a live value there, which is something we
|
// wasn't already a live value there, which is something we
|
||||||
// should verify once we have complete data flow information
|
// should verify once we have complete data flow information
|
||||||
// (todo).
|
// (todo).
|
||||||
c->storeLocal(BytesPerWord, c->constant(0), index);
|
c->storeLocal(1, c->constant(0), index);
|
||||||
frame->storedObject(index);
|
frame->storedObject(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4029,16 +4029,8 @@ class MyCompiler: public Compiler {
|
|||||||
virtual void endSubroutine(Subroutine* subroutine) {
|
virtual void endSubroutine(Subroutine* subroutine) {
|
||||||
MySubroutine* sr = static_cast<MySubroutine*>(subroutine);
|
MySubroutine* sr = static_cast<MySubroutine*>(subroutine);
|
||||||
if (sr->forkState) {
|
if (sr->forkState) {
|
||||||
fprintf(stderr, "restore sr forkstate\n");
|
|
||||||
Local* locals = c.locals;
|
|
||||||
::restoreState(&c, sr->forkState);
|
::restoreState(&c, sr->forkState);
|
||||||
for (int i = c.localFootprint - 1; i >= 0; --i) {
|
|
||||||
if (locals[i].value and c.locals[i].value == 0) {
|
|
||||||
storeLocal(locals[i].footprint, locals[i].value, i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "save sr forkstate\n");
|
|
||||||
sr->forkState = ::saveState(&c);
|
sr->forkState = ::saveState(&c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user