wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-11-02 04:27:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Add rematerialized frames to the table on JitActivation after rematerialization succeeds.

Browse source
This commit is contained in:
wolfbeast 2017-08-15 20:12:03 +02:00 • committed by Roy Tam
commit c9717cf3d1
2 changed files with 71 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
js/src/vm/Stack.cpp
View file

@ -1517,11 +1517,7 @@ jit::JitActivation::getRematerializedFrame(JSContext* cx, const JitFrameIterator
uint8_t* top = iter.fp();
RematerializedFrameTable::AddPtr p = rematerializedFrames_->lookupForAdd(top);
if (!p) {
RematerializedFrameVector empty(cx);
if (!rematerializedFrames_->add(p, top, Move(empty))) {
ReportOutOfMemory(cx);
return nullptr;
}
RematerializedFrameVector frames(cx);
// The unit of rematerialization is an uninlined frame and its inlined
// frames. Since inlined frames do not exist outside of snapshots, it
@ -1536,9 +1532,11 @@ jit::JitActivation::getRematerializedFrame(JSContext* cx, const JitFrameIterator
// be in the activation's compartment.
AutoCompartment ac(cx, compartment_);
if (!RematerializedFrame::RematerializeInlineFrames(cx, top, inlineIter, recover,
p->value()))
{
if (!RematerializedFrame::RematerializeInlineFrames(cx, top, inlineIter, recover, frames))
return nullptr;
if (!rematerializedFrames_->add(p, top, Move(frames))) {
ReportOutOfMemory(cx);
return nullptr;
}