Bug 1017036 - IonMonkey MIPS: Add missing call to skipTrivialBlocks. r=nbp
authorBranislav Rankov <branislav.rankov@imgtec.com>
Thu, 29 May 2014 13:48:46 +0200
changeset 205863 94ea45f19f1f82977e2865fe8ab59dcd708aa75c
parent 205862 25644e63b63f979fad3ac17e5a5ba10e2e26bcd6
child 205864 4265f3812f03d522ea29048289880a07620cd893
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnbp
bugs1017036
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1017036 - IonMonkey MIPS: Add missing call to skipTrivialBlocks. r=nbp
js/src/jit/mips/CodeGenerator-mips.h
--- a/js/src/jit/mips/CodeGenerator-mips.h
+++ b/js/src/jit/mips/CodeGenerator-mips.h
@@ -112,16 +112,18 @@ class CodeGeneratorMIPS : public CodeGen
   protected:
     bool generatePrologue();
     bool generateEpilogue();
     bool generateOutOfLineCode();
 
     template <typename T>
     void branchToBlock(Register lhs, T rhs, MBasicBlock *mir, Assembler::Condition cond)
     {
+        mir = skipTrivialBlocks(mir);
+
         Label *label = mir->lir()->label();
         if (Label *oolEntry = labelForBackedgeWithImplicitCheck(mir)) {
             // Note: the backedge is initially a jump to the next instruction.
             // It will be patched to the target block's label during link().
             RepatchLabel rejoin;
             CodeOffsetJump backedge;
             Label skip;