Skip to content

Commit 48bb2d1

Browse files
committed
[silcodemotion] Rename BBToDataflowStateMap -> EnumCaseDataflowContext.
rdar://36032876
1 parent 9cda905 commit 48bb2d1

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

lib/SILOptimizer/Transforms/SILCodeMotion.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static void createRefCountOpForPayload(SILBuilder &Builder, SILInstruction *I,
110110

111111
namespace {
112112

113-
class BBToDataflowStateMap;
113+
class EnumCaseDataflowContext;
114114

115115
using EnumBBCaseList =
116116
llvm::SmallVector<std::pair<SILBasicBlock *, EnumElementDecl *>, 2>;
@@ -179,24 +179,24 @@ class BBEnumTagDataflowState
179179
/// first predecessor BB.
180180
///
181181
/// We will be performing an intersection in a later step of the merging.
182-
bool initWithFirstPred(BBToDataflowStateMap &BBToStateMap,
182+
bool initWithFirstPred(EnumCaseDataflowContext &BBToStateMap,
183183
SILBasicBlock *FirstPredBB);
184184

185185
/// Top level merging function for predecessors.
186-
void mergePredecessorStates(BBToDataflowStateMap &BBToStateMap);
186+
void mergePredecessorStates(EnumCaseDataflowContext &BBToStateMap);
187187

188188
///
189-
void mergeSinglePredTermInfoIntoState(BBToDataflowStateMap &BBToStateMap,
189+
void mergeSinglePredTermInfoIntoState(EnumCaseDataflowContext &BBToStateMap,
190190
SILBasicBlock *Pred);
191191
};
192192

193193
/// Map all blocks to BBEnumTagDataflowState in RPO order.
194-
class BBToDataflowStateMap {
194+
class EnumCaseDataflowContext {
195195
PostOrderFunctionInfo *PO;
196196
std::vector<BBEnumTagDataflowState> BBToStateVec;
197197

198198
public:
199-
BBToDataflowStateMap(PostOrderFunctionInfo *PO) : PO(PO), BBToStateVec() {
199+
EnumCaseDataflowContext(PostOrderFunctionInfo *PO) : PO(PO), BBToStateVec() {
200200
BBToStateVec.resize(PO->size());
201201
unsigned RPOIdx = 0;
202202
for (SILBasicBlock *BB : PO->getReversePostOrder()) {
@@ -303,7 +303,7 @@ void BBEnumTagDataflowState::handlePredCondSelectEnum(CondBranchInst *CondBr) {
303303
}
304304

305305
bool BBEnumTagDataflowState::initWithFirstPred(
306-
BBToDataflowStateMap &BBToStateMap, SILBasicBlock *FirstPredBB) {
306+
EnumCaseDataflowContext &BBToStateMap, SILBasicBlock *FirstPredBB) {
307307
// Try to look up the state for the first pred BB.
308308
BBEnumTagDataflowState *FirstPredState = BBToStateMap.getBBState(FirstPredBB);
309309

@@ -333,7 +333,7 @@ bool BBEnumTagDataflowState::initWithFirstPred(
333333
}
334334

335335
void BBEnumTagDataflowState::mergeSinglePredTermInfoIntoState(
336-
BBToDataflowStateMap &BBToStateMap, SILBasicBlock *Pred) {
336+
EnumCaseDataflowContext &BBToStateMap, SILBasicBlock *Pred) {
337337
// Grab the terminator of our one predecessor and if it is a switch enum, mix
338338
// it into this state.
339339
TermInst *PredTerm = Pred->getTerminator();
@@ -350,7 +350,7 @@ void BBEnumTagDataflowState::mergeSinglePredTermInfoIntoState(
350350
}
351351

352352
void BBEnumTagDataflowState::mergePredecessorStates(
353-
BBToDataflowStateMap &BBToStateMap) {
353+
EnumCaseDataflowContext &BBToStateMap) {
354354

355355
// If we have no predecessors, there is nothing to do so return early...
356356
if (getBB()->pred_empty()) {
@@ -1595,7 +1595,7 @@ static bool processFunction(SILFunction *F, AliasAnalysis *AA,
15951595

15961596
bool Changed = false;
15971597

1598-
BBToDataflowStateMap BBToStateMap(PO);
1598+
EnumCaseDataflowContext BBToStateMap(PO);
15991599
for (unsigned RPOIdx = 0, RPOEnd = BBToStateMap.size(); RPOIdx < RPOEnd;
16001600
++RPOIdx) {
16011601

0 commit comments

Comments
 (0)