From 8b589fa135d873e683b29ed0918638a79272f5d2 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 28 Nov 2008 21:42:09 +0000 Subject: [PATCH] rename "ping" to "verifyRemoved". I don't know why 'ping' what chosen, but it doesn't make any sense at all. Also make the method const, private, and fit in 80 cols while we're at it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60215 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../llvm/Analysis/MemoryDependenceAnalysis.h | 6 +++-- lib/Analysis/MemoryDependenceAnalysis.cpp | 25 ++++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/include/llvm/Analysis/MemoryDependenceAnalysis.h b/include/llvm/Analysis/MemoryDependenceAnalysis.h index 17e28fc560f..ffc675837ae 100644 --- a/include/llvm/Analysis/MemoryDependenceAnalysis.h +++ b/include/llvm/Analysis/MemoryDependenceAnalysis.h @@ -51,8 +51,6 @@ namespace llvm { reverseDepMapType reverseDepNonLocal; public: - void ping(Instruction* D); - // Special marker indicating that the query has no dependency // in the specified block. static Instruction* const NonLocal; @@ -104,6 +102,10 @@ namespace llvm { void dropInstruction(Instruction* drop); private: + /// verifyRemoved - Verify that the specified instruction does not occur + /// in our internal data structures. + void verifyRemoved(Instruction *Inst) const; + Instruction* getCallSiteDependency(CallSite C, Instruction* start, BasicBlock* block); void nonLocalHelper(Instruction* query, BasicBlock* block, diff --git a/lib/Analysis/MemoryDependenceAnalysis.cpp b/lib/Analysis/MemoryDependenceAnalysis.cpp index f99f6afab5e..0dea0696e04 100644 --- a/lib/Analysis/MemoryDependenceAnalysis.cpp +++ b/lib/Analysis/MemoryDependenceAnalysis.cpp @@ -48,31 +48,32 @@ Instruction* const MemoryDependenceAnalysis::Dirty = (Instruction*)-5; static RegisterPass X("memdep", "Memory Dependence Analysis", false, true); -void MemoryDependenceAnalysis::ping(Instruction *D) { - for (depMapType::iterator I = depGraphLocal.begin(), E = depGraphLocal.end(); - I != E; ++I) { +void MemoryDependenceAnalysis::verifyRemoved(Instruction *D) const { + for (depMapType::const_iterator I = depGraphLocal.begin(), + E = depGraphLocal.end(); I != E; ++I) { assert(I->first != D); assert(I->second.first != D); } - for (nonLocalDepMapType::iterator I = depGraphNonLocal.begin(), E = depGraphNonLocal.end(); - I != E; ++I) { + for (nonLocalDepMapType::const_iterator I = depGraphNonLocal.begin(), + E = depGraphNonLocal.end(); I != E; ++I) { assert(I->first != D); for (DenseMap::iterator II = I->second.begin(), EE = I->second.end(); II != EE; ++II) assert(II->second != D); } - for (reverseDepMapType::iterator I = reverseDep.begin(), E = reverseDep.end(); - I != E; ++I) - for (SmallPtrSet::iterator II = I->second.begin(), EE = I->second.end(); - II != EE; ++II) + for (reverseDepMapType::const_iterator I = reverseDep.begin(), + E = reverseDep.end(); I != E; ++I) + for (SmallPtrSet::const_iterator II = I->second.begin(), + EE = I->second.end(); II != EE; ++II) assert(*II != D); - for (reverseDepMapType::iterator I = reverseDepNonLocal.begin(), E = reverseDepNonLocal.end(); + for (reverseDepMapType::const_iterator I = reverseDepNonLocal.begin(), + E = reverseDepNonLocal.end(); I != E; ++I) - for (SmallPtrSet::iterator II = I->second.begin(), EE = I->second.end(); - II != EE; ++II) + for (SmallPtrSet::const_iterator II = I->second.begin(), + EE = I->second.end(); II != EE; ++II) assert(*II != D); }