From 7050f3d5ecf3f4f16f31df16e58d2d064b02624d Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Wed, 10 Dec 2008 09:38:36 +0000 Subject: [PATCH] Don't dereference the end() iterator. This was causing a bunch of failures when running "make ENABLE_EXPENSIVE_CHECKS=1 check". git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60832 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/MemoryDependenceAnalysis.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Analysis/MemoryDependenceAnalysis.cpp b/lib/Analysis/MemoryDependenceAnalysis.cpp index dbaea11ae4a..a9c9c173559 100644 --- a/lib/Analysis/MemoryDependenceAnalysis.cpp +++ b/lib/Analysis/MemoryDependenceAnalysis.cpp @@ -21,6 +21,7 @@ #include "llvm/Function.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/Support/PredIteratorCache.h" #include "llvm/Support/Debug.h" #include "llvm/Target/TargetData.h" @@ -401,7 +402,7 @@ MemoryDependenceAnalysis::getNonLocalCallDependency(CallSite QueryCS) { NonLocalDepInfo::iterator Entry = std::upper_bound(Cache.begin(), Cache.begin()+NumSortedEntries, std::make_pair(DirtyBB, MemDepResult())); - if (Entry != Cache.begin() && (&*Entry)[-1].first == DirtyBB) + if (Entry != Cache.begin() && prior(Entry)->first == DirtyBB) --Entry; MemDepResult *ExistingResult = 0; @@ -506,7 +507,7 @@ GetNonLocalInfoForBlock(Value *Pointer, uint64_t PointeeSize, NonLocalDepInfo::iterator Entry = std::upper_bound(Cache->begin(), Cache->begin()+NumSortedEntries, std::make_pair(BB, MemDepResult())); - if (Entry != Cache->begin() && (&*Entry)[-1].first == BB) + if (Entry != Cache->begin() && prior(Entry)->first == BB) --Entry; MemDepResult *ExistingResult = 0; -- 2.34.1