@@ -512,8 +512,6 @@
 		0FC20CB61852E2C600C9E954 /* DFGStrengthReductionPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC20CB41852E2C600C9E954 /* DFGStrengthReductionPhase.h */; };
 		0FC20CBA18556A3500C9E954 /* DFGSSALoweringPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC20CB818556A3500C9E954 /* DFGSSALoweringPhase.h */; };
 		0FC314121814559100033232 /* RegisterSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC314101814559100033232 /* RegisterSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		0FC3CCFC19ADA410006AC72A /* DFGBlockMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC3CCF519ADA410006AC72A /* DFGBlockMap.h */; };
-		0FC3CCFD19ADA410006AC72A /* DFGBlockMapInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC3CCF619ADA410006AC72A /* DFGBlockMapInlines.h */; };
 		0FC3CCFE19ADA410006AC72A /* DFGBlockSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC3CCF719ADA410006AC72A /* DFGBlockSet.h */; };
 		0FC3CD0019ADA410006AC72A /* DFGBlockWorklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC3CCF919ADA410006AC72A /* DFGBlockWorklist.h */; };
 		0FC712DF17CD877C008CC93C /* DeferredCompilationCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC712DD17CD8778008CC93C /* DeferredCompilationCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3550,8 +3548,6 @@
 		0FC20CB818556A3500C9E954 /* DFGSSALoweringPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGSSALoweringPhase.h; path = dfg/DFGSSALoweringPhase.h; sourceTree = "<group>"; };
 		0FC314101814559100033232 /* RegisterSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterSet.h; sourceTree = "<group>"; };
 		0FC3141418146D7000033232 /* RegisterSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegisterSet.cpp; sourceTree = "<group>"; };
-		0FC3CCF519ADA410006AC72A /* DFGBlockMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGBlockMap.h; path = dfg/DFGBlockMap.h; sourceTree = "<group>"; };
-		0FC3CCF619ADA410006AC72A /* DFGBlockMapInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGBlockMapInlines.h; path = dfg/DFGBlockMapInlines.h; sourceTree = "<group>"; };
 		0FC3CCF719ADA410006AC72A /* DFGBlockSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGBlockSet.h; path = dfg/DFGBlockSet.h; sourceTree = "<group>"; };
 		0FC3CCF919ADA410006AC72A /* DFGBlockWorklist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGBlockWorklist.h; path = dfg/DFGBlockWorklist.h; sourceTree = "<group>"; };
 		0FC712DC17CD8778008CC93C /* DeferredCompilationCallback.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DeferredCompilationCallback.cpp; sourceTree = "<group>"; };
@@ -9847,8 +9843,6 @@
 				0FD5652216AB780A00197653 /* DFGBasicBlockInlines.h */,
 				A7D89CE417A0B8CC00773AD8 /* DFGBlockInsertionSet.cpp */,
 				A7D89CE517A0B8CC00773AD8 /* DFGBlockInsertionSet.h */,
-				0FC3CCF519ADA410006AC72A /* DFGBlockMap.h */,
-				0FC3CCF619ADA410006AC72A /* DFGBlockMapInlines.h */,
 				0FBF158A19B7A53100695DD0 /* DFGBlockSet.cpp */,
 				0FC3CCF719ADA410006AC72A /* DFGBlockSet.h */,
 				0FBF158B19B7A53100695DD0 /* DFGBlockSetInlines.h */,
@@ -11558,8 +11552,6 @@
 				0F620176143FCD3B0068B77C /* DFGBasicBlock.h in Headers */,
 				0FFB921A16D02EC50055A5DB /* DFGBasicBlockInlines.h in Headers */,
 				A7D89CF417A0B8CC00773AD8 /* DFGBlockInsertionSet.h in Headers */,
-				0FC3CCFC19ADA410006AC72A /* DFGBlockMap.h in Headers */,
-				0FC3CCFD19ADA410006AC72A /* DFGBlockMapInlines.h in Headers */,
 				0FC3CCFE19ADA410006AC72A /* DFGBlockSet.h in Headers */,
 				0FBF158D19B7A53100695DD0 /* DFGBlockSetInlines.h in Headers */,
 				0FC3CD0019ADA410006AC72A /* DFGBlockWorklist.h in Headers */,
 
@@ -31,7 +31,7 @@
 #include "ArrayPrototype.h"
 #include "ClonedArguments.h"
 #include "DFGArgumentsUtilities.h"
-#include "DFGBlockMapInlines.h"
+#include <wtf/IndexMap.h>
 #include "DFGClobberize.h"
 #include "DFGForAllKills.h"
 #include "DFGGraph.h"
@@ -503,7 +503,7 @@ class ArgumentsEliminationPhase : public Phase {
         m_graph.initializeNodeOwners();
         CombinedLiveness combinedLiveness(m_graph);
 
-        BlockMap<Operands<bool>> clobberedByBlock(m_graph);
+        IndexMap<BasicBlock*, Operands<bool>> clobberedByBlock(m_graph.numBlocks());
         for (BasicBlock* block : m_graph.blocksInNaturalOrder()) {
             Operands<bool>& clobberedByThisBlock = clobberedByBlock[block];
             clobberedByThisBlock = Operands<bool>(OperandsLike, m_graph.block(0)->variablesAtHead);
 
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "DFGAtTailAbstractState.h"
-#include "DFGBlockMapInlines.h"
+#include <wtf/IndexMap.h>
 
 #if ENABLE(DFG_JIT)
 
@@ -35,8 +35,8 @@ namespace JSC { namespace DFG {
 
 AtTailAbstractState::AtTailAbstractState(Graph& graph)
     : m_graph(graph)
-    , m_valuesAtTailMap(m_graph)
-    , m_tupleAbstractValues(m_graph)
+    , m_valuesAtTailMap(m_graph.numBlocks())
+    , m_tupleAbstractValues(m_graph.numBlocks())
 {
     for (BasicBlock* block : graph.blocksInNaturalOrder()) {
         auto& valuesAtTail = m_valuesAtTailMap.at(block);
 
@@ -30,7 +30,7 @@
 #include "DFGAbstractInterpreterClobberState.h"
 #include "DFGAbstractValue.h"
 #include "DFGBasicBlock.h"
-#include "DFGBlockMap.h"
+#include <wtf/IndexMap.h>
 #include "DFGGraph.h"
 #include "DFGNodeFlowProjection.h"
 
@@ -268,8 +268,8 @@ class AtTailAbstractState {
 
 private:
     Graph& m_graph;
-    BlockMap<UncheckedKeyHashMap<NodeFlowProjection, AbstractValue>> m_valuesAtTailMap;
-    BlockMap<Vector<AbstractValue>> m_tupleAbstractValues;
+    IndexMap<BasicBlock*, UncheckedKeyHashMap<NodeFlowProjection, AbstractValue>> m_valuesAtTailMap;
+    IndexMap<BasicBlock*, Vector<AbstractValue>> m_tupleAbstractValues;
     BasicBlock* m_block { nullptr };
     bool m_trustEdgeProofs { false };
 };
 
@@ -28,7 +28,7 @@
 
 #if ENABLE(DFG_JIT)
 
-#include "DFGBlockMapInlines.h"
+#include <wtf/IndexMap.h>
 #include "DFGGraph.h"
 #include "DFGPhase.h"
 #include "JSCJSValueInlines.h"
@@ -46,7 +46,7 @@ class BackwardsPropagationPhase : public Phase {
 public:
     BackwardsPropagationPhase(Graph& graph)
         : Phase(graph, "backwards propagation"_s, !graph.afterFixup())
-        , m_flagsAtHead(graph)
+        , m_flagsAtHead(graph.numBlocks())
     {
     }
 
@@ -720,7 +720,7 @@ class BackwardsPropagationPhase : public Phase {
 
     bool m_allowNestedOverflowingAdditions;
 
-    BlockMap<Operands<NodeFlags>> m_flagsAtHead;
+    IndexMap<BasicBlock*, Operands<NodeFlags>> m_flagsAtHead;
     Operands<NodeFlags> m_currentFlags;
 };
 
 
@@ -41,7 +41,7 @@ DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(BasicBlock);
 
 BasicBlock::BasicBlock(BytecodeIndex bytecodeBegin, unsigned numArguments, unsigned numLocals, unsigned numTmps, float executionCount)
     : bytecodeBegin(bytecodeBegin)
-    , index(NoBlock)
+    , m_index(NoBlock)
     , cfaStructureClobberStateAtHead(StructuresAreWatched)
     , cfaStructureClobberStateAtTail(StructuresAreWatched)
     , cfaBranchDirection(InvalidBranchDirection)
@@ -140,7 +140,7 @@ void BasicBlock::replacePredecessor(BasicBlock* from, BasicBlock* to)
 
 void BasicBlock::dump(PrintStream& out) const
 {
-    out.print("#", index);
+    out.print("#", m_index);
 }
 
 BasicBlock::SSAData::SSAData(BasicBlock* block)
 
@@ -165,7 +165,10 @@ class BasicBlock {
     }
 
     bool isJumpPad() { return m_nodes.size() == 1 && m_nodes[0]->isJump(); }
-    
+
+    BlockIndex index() const { return m_index; }
+    void setIndex(BlockIndex index) { m_index = index; }
+
     void NODELETE removePredecessor(BasicBlock* block);
     void NODELETE replacePredecessor(BasicBlock* from, BasicBlock* to);
 
@@ -192,9 +195,9 @@ class BasicBlock {
     // This value is used internally for block linking and OSR entry. It is mostly meaningless
     // for other purposes due to inlining.
     BytecodeIndex bytecodeBegin;
-    
-    BlockIndex index;
-
+private:
+    BlockIndex m_index;
+public:
     StructureClobberState cfaStructureClobberStateAtHead;
     StructureClobberState cfaStructureClobberStateAtTail;
     BranchDirection cfaBranchDirection;
 
@@ -60,7 +60,7 @@ BasicBlock* BlockInsertionSet::insert(size_t index, float executionCount)
 
 BasicBlock* BlockInsertionSet::insertBefore(BasicBlock* before, float executionCount)
 {
-    return insert(before->index, executionCount);
+    return insert(before->index(), executionCount);
 }
 
 bool BlockInsertionSet::execute()
@@ -88,7 +88,7 @@ bool BlockInsertionSet::execute()
 
     // Make sure that the blocks know their new indices.
     for (unsigned i = 0; i < m_graph.m_blocks.size(); ++i)
-        m_graph.m_blocks[i]->index = i;
+        m_graph.m_blocks[i]->setIndex(i);
 
     // And finally, invalidate all analyses that rely on the CFG.
     m_graph.invalidateCFG();
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(BasicBlock);`
`41`	`41`
`42`	`42`	`BasicBlock::BasicBlock(BytecodeIndex bytecodeBegin, unsigned numArguments, unsigned numLocals, unsigned numTmps, float executionCount)`
`43`	`43`	`: bytecodeBegin(bytecodeBegin)`
`44`		`- , index(NoBlock)`
	`44`	`+ , m_index(NoBlock)`
`45`	`45`	`, cfaStructureClobberStateAtHead(StructuresAreWatched)`
`46`	`46`	`, cfaStructureClobberStateAtTail(StructuresAreWatched)`
`47`	`47`	`, cfaBranchDirection(InvalidBranchDirection)`
`@@ -140,7 +140,7 @@ void BasicBlock::replacePredecessor(BasicBlock* from, BasicBlock* to)`
`140`	`140`
`141`	`141`	`void BasicBlock::dump(PrintStream& out) const`
`142`	`142`	`{`
`143`		`- out.print("#", index);`
	`143`	`+ out.print("#", m_index);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`BasicBlock::SSAData::SSAData(BasicBlock* block)`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ BasicBlock* BlockInsertionSet::insert(size_t index, float executionCount)`
`60`	`60`
`61`	`61`	`BasicBlock* BlockInsertionSet::insertBefore(BasicBlock* before, float executionCount)`
`62`	`62`	`{`
`63`		`- return insert(before->index, executionCount);`
	`63`	`+ return insert(before->index(), executionCount);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`bool BlockInsertionSet::execute()`
`@@ -88,7 +88,7 @@ bool BlockInsertionSet::execute()`
`88`	`88`
`89`	`89`	`// Make sure that the blocks know their new indices.`
`90`	`90`	`for (unsigned i = 0; i < m_graph.m_blocks.size(); ++i)`
`91`		`- m_graph.m_blocks[i]->index = i;`
	`91`	`+ m_graph.m_blocks[i]->setIndex(i);`
`92`	`92`
`93`	`93`	`// And finally, invalidate all analyses that rely on the CFG.`
`94`	`94`	`m_graph.invalidateCFG();`