From d3487bdb616a546f276133a21fe2f955513f80b9 Mon Sep 17 00:00:00 2001 From: Max Kazantsev Date: Thu, 30 Aug 2018 09:24:33 +0000 Subject: [PATCH] [NFC] Rename map to make the naming consistent llvm-svn: 341043 --- llvm/include/llvm/Analysis/InstructionPrecedenceTracking.h | 3 +-- 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 a9ec85f..0a82eec 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 - FirstImplicitControlFlowInsts; + DenseMap 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 7294e12..d045771 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(); } -- 2.7.4