From c4e92b4d222dab4c90c2e276b26434f506c89c33 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Tue, 5 Aug 2014 13:33:17 +0100
Subject: [PATCH] Backed out changeset 2d35b006a2f6 (bug 1042729)

---
 js/src/jit/MIR.h        |  6 +-----
 js/src/jit/MIRGraph.cpp |  2 --
 js/src/jit/MIRGraph.h   | 14 +-------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h
index 61a9c82bd42..f62a2bc8a8c 100644
--- a/js/src/jit/MIR.h
+++ b/js/src/jit/MIR.h
@@ -10206,11 +10206,7 @@ class MNewDenseArrayPar : public MBinaryInstruction
 // A resume point contains the information needed to reconstruct the Baseline
 // state from a position in the JIT. See the big comment near resumeAfter() in
 // IonBuilder.cpp.
-class MResumePoint MOZ_FINAL :
-  public MNode
-#ifdef DEBUG
-  , public InlineForwardListNode<MResumePoint>
-#endif
+class MResumePoint MOZ_FINAL : public MNode, public InlineForwardListNode<MResumePoint>
 {
   public:
     enum Mode {
diff --git a/js/src/jit/MIRGraph.cpp b/js/src/jit/MIRGraph.cpp
index a08861b8e44..815608f9633 100644
--- a/js/src/jit/MIRGraph.cpp
+++ b/js/src/jit/MIRGraph.cpp
@@ -728,7 +728,6 @@ MBasicBlock::discardResumePoint(MResumePoint *rp, ReferencesType refType /* = Re
 {
     if (refType & RefType_DiscardOperands)
         rp->discardUses();
-#ifdef DEBUG
     MResumePointIterator iter = resumePointsBegin();
     while (*iter != rp) {
         // We should reach it before reaching the end.
@@ -736,7 +735,6 @@ MBasicBlock::discardResumePoint(MResumePoint *rp, ReferencesType refType /* = Re
         iter++;
     }
     resumePoints_.removeAt(iter);
-#endif
 }
 
 void
diff --git a/js/src/jit/MIRGraph.h b/js/src/jit/MIRGraph.h
index b91a48c53f5..b2de6ec85c7 100644
--- a/js/src/jit/MIRGraph.h
+++ b/js/src/jit/MIRGraph.h
@@ -27,10 +27,7 @@ class MDefinitionIterator;
 typedef InlineListIterator<MInstruction> MInstructionIterator;
 typedef InlineListReverseIterator<MInstruction> MInstructionReverseIterator;
 typedef InlineListIterator<MPhi> MPhiIterator;
-
-#ifdef DEBUG
 typedef InlineForwardListIterator<MResumePoint> MResumePointIterator;
-#endif
 
 class LBlock;
 
@@ -187,9 +184,7 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
 
     // Adds a resume point to this block.
     void addResumePoint(MResumePoint *resume) {
-#ifdef DEBUG
         resumePoints_.pushFront(resume);
-#endif
     }
 
     // Discard pre-allocated resume point.
@@ -346,7 +341,6 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
     bool phisEmpty() const {
         return phis_.empty();
     }
-#ifdef DEBUG
     MResumePointIterator resumePointsBegin() const {
         return resumePoints_.begin();
     }
@@ -356,7 +350,6 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
     bool resumePointsEmpty() const {
         return resumePoints_.empty();
     }
-#endif
     MInstructionIterator begin() {
         return instructions_.begin();
     }
@@ -569,6 +562,7 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
     InlineList<MInstruction> instructions_;
     Vector<MBasicBlock *, 1, IonAllocPolicy> predecessors_;
     InlineList<MPhi> phis_;
+    InlineForwardList<MResumePoint> resumePoints_;
     FixedList<MDefinition *> slots_;
     uint32_t stackPosition_;
     uint32_t id_;
@@ -585,12 +579,6 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
     // beginning of the call-site which is being inlined after this block.
     MResumePoint *outerResumePoint_;
 
-#ifdef DEBUG
-    // Unordered list used to verify that all the resume points which are
-    // registered are correctly removed when a basic block is removed.
-    InlineForwardList<MResumePoint> resumePoints_;
-#endif
-
     MBasicBlock *successorWithPhis_;
     uint32_t positionInPhiSuccessor_;
     uint32_t loopDepth_;