diff options
| -rw-r--r-- | llvm/include/llvm/Analysis/InstructionPrecedenceTracking.h | 3 | ||||
| -rw-r--r-- | llvm/lib/Analysis/InstructionPrecedenceTracking.cpp | 12 | 
2 files changed, 7 insertions, 8 deletions
diff --git a/llvm/include/llvm/Analysis/InstructionPrecedenceTracking.h b/llvm/include/llvm/Analysis/InstructionPrecedenceTracking.h index a9ec85f7a6c..0a82eece50f 100644 --- a/llvm/include/llvm/Analysis/InstructionPrecedenceTracking.h +++ b/llvm/include/llvm/Analysis/InstructionPrecedenceTracking.h @@ -28,8 +28,7 @@ namespace llvm {  class InstructionPrecedenceTracking {    // Maps a block to the topmost special instruction in it. -  DenseMap<const BasicBlock *, const Instruction *> -      FirstImplicitControlFlowInsts; +  DenseMap<const BasicBlock *, const Instruction *> FirstSpecialInsts;    // Allows to answer queries about precedence of instructions within one block.    OrderedInstructions OI;    // Blocks for which we have the up-to-date cached information. diff --git a/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp b/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp index 7294e121507..d0457715196 100644 --- a/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp +++ b/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp @@ -27,7 +27,7 @@ const Instruction *InstructionPrecedenceTracking::getFirstSpecialInstruction(      const BasicBlock *BB) {    if (!KnownBlocks.count(BB))      fill(BB); -  auto *FirstICF = FirstImplicitControlFlowInsts.lookup(BB); +  auto *FirstICF = FirstSpecialInsts.lookup(BB);    assert((!FirstICF || FirstICF->getParent() == BB) && "Inconsistent cache!");    return FirstICF;  } @@ -45,10 +45,10 @@ bool InstructionPrecedenceTracking::isPreceededBySpecialInstruction(  }  void InstructionPrecedenceTracking::fill(const BasicBlock *BB) { -  FirstImplicitControlFlowInsts.erase(BB); +  FirstSpecialInsts.erase(BB);    for (auto &I : *BB)      if (isSpecialInstruction(&I)) { -      FirstImplicitControlFlowInsts[BB] = &I; +      FirstSpecialInsts[BB] = &I;        break;      } @@ -58,14 +58,14 @@ void InstructionPrecedenceTracking::fill(const BasicBlock *BB) {  void InstructionPrecedenceTracking::invalidateBlock(const BasicBlock *BB) {    OI.invalidateBlock(BB); -  FirstImplicitControlFlowInsts.erase(BB); +  FirstSpecialInsts.erase(BB);    KnownBlocks.erase(BB);  }  void InstructionPrecedenceTracking::clear() { -  for (auto It : FirstImplicitControlFlowInsts) +  for (auto It : FirstSpecialInsts)      OI.invalidateBlock(It.first); -  FirstImplicitControlFlowInsts.clear(); +  FirstSpecialInsts.clear();    KnownBlocks.clear();  }  | 

