mirror of
https://github.com/corda/corda.git
synced 2025-01-09 06:23:04 +00:00
only add site to result if result is live in CombineEvent::compile and TranslateEvent::compile
This commit is contained in:
parent
5adcfa3341
commit
93ebb571b3
@ -2766,24 +2766,24 @@ maybePreserve(Context* c, Value* v, Site* s)
|
||||
Site*
|
||||
getTarget(Context* c, Value* value, Value* result, const SiteMask& resultMask)
|
||||
{
|
||||
Site* s;
|
||||
Value* v;
|
||||
if (c->arch->condensedAddressing()) {
|
||||
Site* s = value->source;
|
||||
|
||||
s = value->source;
|
||||
v = value;
|
||||
maybePreserve(c, value, s);
|
||||
|
||||
removeSite(c, value, s);
|
||||
|
||||
s->freeze(c, value);
|
||||
|
||||
return s;
|
||||
} else {
|
||||
SingleRead r(resultMask);
|
||||
Site* s = pickTargetSite(c, &r);
|
||||
|
||||
s = pickTargetSite(c, &r);
|
||||
v = result;
|
||||
addSite(c, result, s);
|
||||
}
|
||||
|
||||
removeSite(c, v, s);
|
||||
|
||||
s->freeze(c, v);
|
||||
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
Site*
|
||||
@ -2866,7 +2866,6 @@ class CombineEvent: public Event {
|
||||
popRead(c, this, r->value);
|
||||
}
|
||||
|
||||
if (c->arch->condensedAddressing()) {
|
||||
low->thaw(c, second);
|
||||
if (resultSize > BytesPerWord) {
|
||||
high->thaw(c, second->high);
|
||||
@ -2879,7 +2878,6 @@ class CombineEvent: public Event {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TernaryOperation type;
|
||||
unsigned firstSize;
|
||||
@ -3197,7 +3195,6 @@ class TranslateEvent: public Event {
|
||||
popRead(c, this, r->value);
|
||||
}
|
||||
|
||||
if (c->arch->condensedAddressing()) {
|
||||
low->thaw(c, value);
|
||||
if (size > BytesPerWord) {
|
||||
high->thaw(c, value->high);
|
||||
@ -3210,7 +3207,6 @@ class TranslateEvent: public Event {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BinaryOperation type;
|
||||
unsigned size;
|
||||
|
Loading…
Reference in New Issue
Block a user