commit 913b71b9573081942cca8231ade597f94022398f Author: Dan Gohman sunfish@mozilla.com Date: Thu Feb 13 14:25:20 2014 -0500

Bug 960145 - IonMonkey: Don't ignore OSR-like values when computing phi ranges. r=mrosenberg, a=sledru --- js/src/jit/MIR.h | 13 ------------- js/src/jit/RangeAnalysis.cpp | 4 ---- 2 files changed, 17 deletions(-)

diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index 9633d0a..e9bc029 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -77,8 +77,6 @@ class MUse; class MIRGraph; class MResumePoint;

-static inline bool isOSRLikeValue (MDefinition *def); - // Represents a use of a node. class MUse : public TempObject, public InlineListNode<MUse> { @@ -8267,17 +8265,6 @@ MInstruction *MDefinition::toInstruction() return (MInstruction *)this; }

-static inline bool isOSRLikeValue (MDefinition *def) { - if (def->isOsrValue()) - return true; - - if (def->isUnbox()) - if (def->getOperand(0)->isOsrValue()) - return true; - - return false; -} - typedef Vector<MDefinition *, 8, IonAllocPolicy> MDefinitionVector;

// Helper functions used to decide how to build MIR. diff --git a/js/src/jit/RangeAnalysis.cpp b/js/src/jit/RangeAnalysis.cpp index c8cbc20..4381d84 100644 --- a/js/src/jit/RangeAnalysis.cpp +++ b/js/src/jit/RangeAnalysis.cpp @@ -536,16 +536,12 @@ MPhi::computeRange() return;

Range *range = NULL; - JS_ASSERT(getOperand(0)->op() != MDefinition::Op_OsrValue); for (size_t i = 0; i < numOperands(); i++) { if (getOperand(i)->block()->earlyAbort()) { IonSpew(IonSpew_Range, "Ignoring unreachable input %d", getOperand(i)->id()); continue; }

- if (isOSRLikeValue(getOperand(i))) - continue; - Range *input = getOperand(i)->range();

if (!input) {