Bug 1342196 - Remove assertion exception for MagicOptimizedArguments. r=h4writer
authorSean Stangl <sstangl@mozilla.com>
Thu, 23 Feb 2017 12:11:00 -0500
changeset 373685 40da4a08377d0d69f76195b7d7f375ac34e2d3a2
parent 373684 c1e74895212a5eecbe1d1e643c8e36a80852bc40
child 373686 b836770e5cb1bb61fa85a2d18744f3201adc3413
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersh4writer
bugs1342196
milestone54.0a1
Bug 1342196 - Remove assertion exception for MagicOptimizedArguments. r=h4writer
js/src/jit/IonAnalysis.cpp
--- a/js/src/jit/IonAnalysis.cpp
+++ b/js/src/jit/IonAnalysis.cpp
@@ -3033,22 +3033,16 @@ jit::AssertExtendedGraphCoherency(MIRGra
         MOZ_ASSERT(successorWithPhis <= 1);
         MOZ_ASSERT((successorWithPhis != 0) == (block->successorWithPhis() != nullptr));
 
         // Verify that phi operands dominate the corresponding CFG predecessor
         // edges.
         for (MPhiIterator iter(block->phisBegin()), end(block->phisEnd()); iter != end; ++iter) {
             MPhi* phi = *iter;
             for (size_t i = 0, e = phi->numOperands(); i < e; ++i) {
-                // We sometimes see a phi with a magic-optimized-arguments
-                // operand defined in the normal entry block, while the phi is
-                // also reachable from the OSR entry (auto-regress/bug779818.js)
-                if (phi->getOperand(i)->type() == MIRType::MagicOptimizedArguments)
-                    continue;
-
                 MOZ_ASSERT(phi->getOperand(i)->block()->dominates(block->getPredecessor(i)),
                            "Phi input is not dominated by its operand");
             }
         }
 
         // Verify that instructions are dominated by their operands.
         for (MInstructionIterator iter(block->begin()), end(block->end()); iter != end; ++iter) {
             MInstruction* ins = *iter;