wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1118894 - IonMonkey: Don't insist on making loops contiguous if they contain OSR entries into former loop blocks. r=jandem

Browse Source
This commit is contained in:
Dan Gohman 2015-01-24 13:39:35 -05:00
parent 88673d3751
commit c1f763e94e
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/jit/IonAnalysis.cpp
View File

@ -3482,7 +3482,9 @@ MakeLoopContiguous(MIRGraph &graph, MBasicBlock *header, size_t numMarked)
size_t headerId = header->id();
size_t inLoopId = headerId;
size_t notInLoopId = inLoopId + numMarked;
size_t numOSRDominated = 0;
ReversePostorderIterator i = graph.rpoBegin(header);
MBasicBlock *osrBlock = graph.osrBlock();
for (;;) {
MBasicBlock *block = *i++;
MOZ_ASSERT(block->id() >= header->id() && block->id() <= backedge->id(),
@ -3495,6 +3497,15 @@ MakeLoopContiguous(MIRGraph &graph, MBasicBlock *header, size_t numMarked)
// If we've reached the loop backedge, we're done!
if (block == backedge)
break;
} else if (osrBlock && osrBlock->dominates(block)) {
// This block is not in the loop, but since it's dominated by the
// OSR entry, the block was probably in the loop before some
// folding. This probably means that the block has outgoing paths
// which re-enter the loop in the middle. And that, finally, means
// that we can't move this block to the end, since it could create a
// backwards branch to a block which is not the loop header.
block->setId(inLoopId++);
++numOSRDominated;
} else {
// This block is not in the loop. Move it to the end.
graph.moveBlockBefore(insertPt, block);
@ -3502,8 +3513,11 @@ MakeLoopContiguous(MIRGraph &graph, MBasicBlock *header, size_t numMarked)
}
}
MOZ_ASSERT(header->id() == headerId, "Loop header id changed");
MOZ_ASSERT(inLoopId == headerId + numMarked, "Wrong number of blocks kept in loop");
MOZ_ASSERT(notInLoopId == (insertIter != graph.rpoEnd() ? insertPt->id() : graph.numBlocks()),
MOZ_ASSERT(inLoopId == headerId + numMarked + numOSRDominated,
"Wrong number of blocks kept in loop");
MOZ_ASSERT(notInLoopId == (insertIter != graph.rpoEnd()
? insertPt->id()
: graph.numBlocks()) - numOSRDominated,
"Wrong number of blocks moved out of loop");
}