diff --git a/js/src/jit/IonControlFlow.h b/js/src/jit/IonControlFlow.h index 96c47d862dee..65cc984d60a5 100644 --- a/js/src/jit/IonControlFlow.h +++ b/js/src/jit/IonControlFlow.h @@ -53,11 +53,10 @@ class CFGBlock : public TempObject { jsbytecode* start; jsbytecode* stop; CFGControlInstruction* end; - bool inWorkList; public: explicit CFGBlock(jsbytecode* start) - : id_(-1), start(start), stop(nullptr), end(nullptr), inWorkList(false) {} + : id_(-1), start(start), stop(nullptr), end(nullptr) {} static CFGBlock* New(TempAllocator& alloc, jsbytecode* start) { return new (alloc) CFGBlock(start); @@ -77,15 +76,6 @@ class CFGBlock : public TempObject { return end; } void setStopIns(CFGControlInstruction* stopIns) { end = stopIns; } - bool isInWorkList() const { return inWorkList; } - void setInWorklist() { - MOZ_ASSERT(!inWorkList); - inWorkList = true; - } - void clearInWorkList() { - MOZ_ASSERT(inWorkList); - inWorkList = false; - } size_t id() const { return id_; } void setId(size_t id) { id_ = id; } }; diff --git a/js/src/jit/MIRGraph.cpp b/js/src/jit/MIRGraph.cpp index 3a7397a33a19..1747827b71de 100644 --- a/js/src/jit/MIRGraph.cpp +++ b/js/src/jit/MIRGraph.cpp @@ -116,16 +116,6 @@ void MIRGraph::insertBlockBefore(MBasicBlock* at, MBasicBlock* block) { numBlocks_++; } -void MIRGraph::renumberBlocksAfter(MBasicBlock* at) { - MBasicBlockIterator iter = begin(at); - iter++; - - uint32_t id = at->id(); - for (; iter != end(); iter++) { - iter->setId(++id); - } -} - bool MIRGraph::removeSuccessorBlocks(MBasicBlock* start) { if (!start->hasLastIns()) { return true; diff --git a/js/src/jit/MIRGraph.h b/js/src/jit/MIRGraph.h index 58af4784818f..e755ede11d12 100644 --- a/js/src/jit/MIRGraph.h +++ b/js/src/jit/MIRGraph.h @@ -747,8 +747,6 @@ class MIRGraph { void insertBlockAfter(MBasicBlock* at, MBasicBlock* block); void insertBlockBefore(MBasicBlock* at, MBasicBlock* block); - void renumberBlocksAfter(MBasicBlock* at); - void unmarkBlocks(); void setReturnAccumulator(MIRGraphReturns* accum) { @@ -799,12 +797,6 @@ class MIRGraph { uint32_t getNumInstructionIds() { return idGen_; } MResumePoint* entryResumePoint() { return entryBlock()->entryResumePoint(); } - void copyIds(const MIRGraph& other) { - idGen_ = other.idGen_; - blockIdGen_ = other.blockIdGen_; - numBlocks_ = other.numBlocks_; - } - void setOsrBlock(MBasicBlock* osrBlock) { MOZ_ASSERT(!osrBlock_); osrBlock_ = osrBlock; diff --git a/js/src/vm/NativeObject-inl.h b/js/src/vm/NativeObject-inl.h index 023374b1deeb..dc1ec3712d7e 100644 --- a/js/src/vm/NativeObject-inl.h +++ b/js/src/vm/NativeObject-inl.h @@ -467,13 +467,6 @@ MOZ_ALWAYS_INLINE void NativeObject::setSlotWithType(JSContext* cx, AddTypePropertyId(cx, this, shape->propid(), value); } -inline void NativeObject::updateShapeAfterMovingGC() { - Shape* shape = this->shape(); - if (IsForwarded(shape)) { - shape_.unsafeSet(Forwarded(shape)); - } -} - inline bool NativeObject::isInWholeCellBuffer() const { const gc::TenuredCell* cell = &asTenured(); gc::ArenaCellSet* cells = cell->arena()->bufferedCells(); diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h index 6d0b5f18f1fd..429ee4076d0d 100644 --- a/js/src/vm/NativeObject.h +++ b/js/src/vm/NativeObject.h @@ -1484,7 +1484,6 @@ class NativeObject : public JSObject { /* Return the allocKind we would use if we were to tenure this object. */ inline js::gc::AllocKind allocKindForTenure() const; - void updateShapeAfterMovingGC(); void sweepDictionaryListPointer(); void updateDictionaryListPointerAfterMinorGC(NativeObject* old);