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

fix regression in last commit

Browse Source
This commit is contained in:
Joel Dice 2008-11-17 08:44:35 -07:00
parent 9aee242408
commit 3d9e508e3e
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/compiler.cpp
View File

@ -1972,12 +1972,12 @@ swap(Context* c, Register* a, Register* b)
} }
Register* Register*
replace(Context* c, Stack* stack, Local* locals, Register* r) replace(Context* c, Register* r, Value* newValue, Stack* stack, Local* locals)
{ {
uint32_t mask = (r->freezeCount? r->site->mask : ~0); uint32_t mask = (r->freezeCount? r->site->mask : ~0);
freeze(c, r); freeze(c, r);
Register* s = acquire(c, mask, stack, locals, r->size, r->value, r->site); Register* s = acquire(c, mask, stack, locals, r->size, newValue, r->site);
thaw(c, r); thaw(c, r);
if (DebugRegisters) { if (DebugRegisters) {
@ -2005,7 +2005,7 @@ acquire(Context* c, uint32_t mask, Stack* stack, Local* locals,
} }
if (r->refCount) { if (r->refCount) {
r = replace(c, stack, locals, r); r = replace(c, r, newValue, stack, locals);
} else { } else {
Value* oldValue = r->value; Value* oldValue = r->value;
if (oldValue if (oldValue
@ -2013,7 +2013,7 @@ acquire(Context* c, uint32_t mask, Stack* stack, Local* locals,
and findSite(c, oldValue, r->site)) and findSite(c, oldValue, r->site))
{ {
if (not trySteal(c, r, newValue, stack, locals)) { if (not trySteal(c, r, newValue, stack, locals)) {
r = replace(c, stack, locals, r); r = replace(c, r, newValue, stack, locals);
} }
} }
} }