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 1009899 - Don't unnecessarily freeze inlining done during definite properties analysis, r=jandem.

Browse Source
This commit is contained in:
Brian Hackett 2014-05-19 11:33:11 -07:00
parent e67de1f1f2
commit 15c7d0da1e
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2358,6 +2358,9 @@ jit::AnalyzeNewScriptProperties(JSContext *cx, JSFunction *fun,
return false;
}
// id of the last block which added a new property.
size_t lastAddedBlock = 0;
for (size_t i = 0; i < instructions.length(); i++) {
MInstruction *ins = instructions[i];
@ -2384,6 +2387,7 @@ jit::AnalyzeNewScriptProperties(JSContext *cx, JSFunction *fun,
definitelyExecuted = false;
bool handled = false;
size_t slotSpan = baseobj->slotSpan();
if (!AnalyzePoppedThis(cx, type, thisValue, ins, definitelyExecuted,
baseobj, initializerList, &accessedProperties, &handled))
{
@ -2391,6 +2395,11 @@ jit::AnalyzeNewScriptProperties(JSContext *cx, JSFunction *fun,
}
if (!handled)
break;
if (slotSpan != baseobj->slotSpan()) {
JS_ASSERT(ins->block()->id() >= lastAddedBlock);
lastAddedBlock = ins->block()->id();
}
}
if (baseobj->slotSpan() != 0) {
@ -2400,6 +2409,10 @@ jit::AnalyzeNewScriptProperties(JSContext *cx, JSFunction *fun,
// called at the inline frame sites.
Vector<MBasicBlock *> exitBlocks(cx);
for (MBasicBlockIterator block(graph.begin()); block != graph.end(); block++) {
// Inlining decisions made after the last new property was added to
// the object don't need to be frozen.
if (block->id() > lastAddedBlock)
break;
if (MResumePoint *rp = block->callerResumePoint()) {
if (block->numPredecessors() == 1 && block->getPredecessor(0) == rp->block()) {
JSScript *script = rp->block()->info().script();