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

preserve old value of local variable across store if it will be used later; tweak site ownership transfer in MoveEvent.compile

Browse Source
This commit is contained in:
Joel Dice 2008-05-19 08:53:40 -06:00
parent 292f84a3fa
commit 83da1ec205
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/compiler.cpp
View File

@ -1520,12 +1520,12 @@ class MoveEvent: public Event {
}
}
if (target == src->source) {
nextRead(c, src);
}
assert(c, isLoad or isStore or target != src->source);
if (target == src->source) {
removeSite(c, src, target);
}
if (not isStore) {
addSite(c, stack, size, dst, target);
}
@ -1556,9 +1556,7 @@ class MoveEvent: public Event {
removeSite(c, dst, target);
}
if (target != src->source) {
nextRead(c, src);
}
nextRead(c, src);
}
BinaryOperation type;
@ -1639,15 +1637,22 @@ appendCompare(Context* c, unsigned size, Value* first, Value* second)
CompareEvent(c, size, first, second, firstTarget, secondTarget);
}
void
preserve(Context* c, Stack* stack, unsigned size, Value* v, Site* s,
Read* read)
{
assert(c, v->sites == s);
Site* r = targetOrNull(c, read);
if (r == 0 or r == s) r = freeRegisterSite(c);
addSite(c, stack, size, v, r);
apply(c, Move, size, s, r);
}
void
maybePreserve(Context* c, Stack* stack, unsigned size, Value* v, Site* s)
{
if (v->reads->next and v->sites->next == 0) {
assert(c, v->sites == s);
Site* r = targetOrNull(c, v->reads->next);
if (r == 0 or r == s) r = freeRegisterSite(c);
addSite(c, stack, size, v, r);
apply(c, Move, size, s, r);
preserve(c, stack, size, v, s, v->reads->next);
}
}
@ -2095,6 +2100,12 @@ class LocalEvent: public Event {
}
if (oldValue) {
if (oldValue->reads
and oldValue->sites->next == 0
and oldValue->sites == site)
{
preserve(c, stack, size, oldValue, site, oldValue->reads);
}
removeSite(c, oldValue, site);
}