Fix GLIBCXX_DEBUG error owing to dereference of end iterator. There's

no guarantee that an instruction returned by getDependency exists in
the maps.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@40647 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 8 insertions, 3 deletions

diff --git a/include/llvm/Analysis/MemoryDependenceAnalysis.h b/include/llvm/Analysis/MemoryDependenceAnalysis.h
index 8679cd9..7546eda 100644
--- a/include/llvm/Analysis/MemoryDependenceAnalysis.h
+++ b/include/llvm/Analysis/MemoryDependenceAnalysis.h
@@ -32,9 +32,14 @@ class Instruction;
 
 class MemoryDependenceAnalysis : public FunctionPass {
   private:
-    
-    DenseMap<Instruction*, std::pair<Instruction*, bool> > depGraphLocal;
-    std::multimap<Instruction*, Instruction*> reverseDep;
+
+    typedef DenseMap<Instruction*, std::pair<Instruction*, bool> > 
+    depMapType;
+
+    depMapType depGraphLocal;
+
+    typedef std::multimap<Instruction*, Instruction*> reverseDepMapType;
+    reverseDepMapType reverseDep;
   
     Instruction* getCallSiteDependency(CallSite C, Instruction* start,
                                        bool local = true);