Bug 1058077 - IonMonkey: Eliminate the unused osrStart_ field form MIRGraph r=sstangl
authorDan Gohman <sunfish@mozilla.com>
Mon, 25 Aug 2014 15:03:24 -0700
changeset 201600 949cf26ba3d5cb6ed17ba5fb626be29051a099ab
parent 201599 73d25b34ba67c8ee87c3dc555e8e00206f0638e1
child 201601 af7832580b3ad586c7db86159eb64e755b1728e1
push id27375
push userryanvm@gmail.com
push dateTue, 26 Aug 2014 19:56:59 +0000
treeherdermozilla-central@f9bfe115fee5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssstangl
bugs1058077
milestone34.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 1058077 - IonMonkey: Eliminate the unused osrStart_ field form MIRGraph r=sstangl
js/src/jit/IonBuilder.cpp
js/src/jit/MIRGraph.h
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -5977,17 +5977,16 @@ IonBuilder::newOsrPreheader(MBasicBlock 
         MOsrValue *osrv = MOsrValue::New(alloc(), entry, offset);
         osrBlock->add(osrv);
         osrBlock->initSlot(slot, osrv);
     }
 
     // Create an MStart to hold the first valid MResumePoint.
     MStart *start = MStart::New(alloc(), MStart::StartType_Osr);
     osrBlock->add(start);
-    graph().setOsrStart(start);
 
     // MOsrValue instructions are infallible, so the first MResumePoint must
     // occur after they execute, at the point of the MStart.
     if (!resumeAt(start, loopEntry))
         return nullptr;
 
     // Link the same MResumePoint from the MStart to each MOsrValue.
     // This causes logic in ShouldSpecializeInput() to not replace Uses with
--- a/js/src/jit/MIRGraph.h
+++ b/js/src/jit/MIRGraph.h
@@ -646,29 +646,27 @@ typedef Vector<MBasicBlock *, 1, IonAllo
 class MIRGraph
 {
     InlineList<MBasicBlock> blocks_;
     TempAllocator *alloc_;
     MIRGraphReturns *returnAccumulator_;
     uint32_t blockIdGen_;
     uint32_t idGen_;
     MBasicBlock *osrBlock_;
-    MStart *osrStart_;
 
     size_t numBlocks_;
     bool hasTryBlock_;
 
   public:
     explicit MIRGraph(TempAllocator *alloc)
       : alloc_(alloc),
         returnAccumulator_(nullptr),
         blockIdGen_(0),
         idGen_(0),
         osrBlock_(nullptr),
-        osrStart_(nullptr),
         numBlocks_(0),
         hasTryBlock_(false)
     { }
 
     TempAllocator &alloc() const {
         return *alloc_;
     }
 
@@ -760,22 +758,16 @@ class MIRGraph
 
     void setOsrBlock(MBasicBlock *osrBlock) {
         JS_ASSERT(!osrBlock_);
         osrBlock_ = osrBlock;
     }
     MBasicBlock *osrBlock() {
         return osrBlock_;
     }
-    void setOsrStart(MStart *osrStart) {
-        osrStart_ = osrStart;
-    }
-    MStart *osrStart() {
-        return osrStart_;
-    }
 
     bool hasTryBlock() const {
         return hasTryBlock_;
     }
     void setHasTryBlock() {
         hasTryBlock_ = true;
     }