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

don't use trySteal when moving sites between buddies

Browse Source
This commit is contained in:
Joel Dice 2008-12-13 13:54:26 -07:00
parent 4717e94fa3
commit 7f4bd51464
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/compiler.cpp
View File

@ -1895,7 +1895,7 @@ releaseRegister(Context* c, Value* v, unsigned frameIndex,
} }
} }
if (not remaining) { if (live(v) and not remaining) {
move(c, c->stack, c->locals, sizeInBytes, v, source, move(c, c->stack, c->locals, sizeInBytes, v, source,
frameSite(c, frameIndex)); frameSite(c, frameIndex));
} }
@ -2034,6 +2034,16 @@ replace(Context* c, Register* r, Value* newValue, Stack* stack, Local* locals)
return s; return s;
} }
bool
buddies(Value* a, Value* b)
{
if (a == b) return true;
for (Value* p = a->buddy; p != a; p = p->buddy) {
if (p == b) return true;
}
return false;
}
Register* Register*
acquire(Context* c, uint32_t mask, Stack* stack, Local* locals, acquire(Context* c, uint32_t mask, Stack* stack, Local* locals,
unsigned newSize, Value* newValue, RegisterSite* newSite) unsigned newSize, Value* newValue, RegisterSite* newSite)
@ -2057,7 +2067,11 @@ acquire(Context* c, uint32_t mask, Stack* stack, Local* locals,
and oldValue != newValue and oldValue != newValue
and findSite(c, oldValue, r->site)) and findSite(c, oldValue, r->site))
{ {
if (r->freezeCount or (not trySteal(c, r, newValue, stack, locals))) { if (buddies(oldValue, newValue)) {
removeSite(c, oldValue, r->site);
} else if (r->freezeCount
or (not trySteal(c, r, newValue, stack, locals)))
{
r = replace(c, r, newValue, stack, locals); r = replace(c, r, newValue, stack, locals);
} }
} }
@ -2169,7 +2183,9 @@ acquireFrameIndex(Context* c, int frameIndex, Stack* stack, Local* locals,
and oldValue != newValue and oldValue != newValue
and findSite(c, oldValue, r->site)) and findSite(c, oldValue, r->site))
{ {
if (not trySteal(c, r, newValue, stack, locals)) { if (buddies(oldValue, newValue)) {
removeSite(c, oldValue, r->site);
} else if (not trySteal(c, r, newValue, stack, locals)) {
abort(c); abort(c);
} }
} }