From 651a5a2401ac76e53dbcc0cdb0a0e74f2352a783 Mon Sep 17 00:00:00 2001 From: Adam Nemet Date: Sun, 9 Aug 2015 20:06:08 +0000 Subject: [PATCH] [LAA] Remove unused pointer partition argument from needsChecking(), NFC This is no longer used in any of the callers. Also remove the logic of handling this argument. llvm-svn: 244421 --- llvm/include/llvm/Analysis/LoopAccessAnalysis.h | 11 +++-------- llvm/lib/Analysis/LoopAccessAnalysis.cpp | 14 ++++---------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/llvm/include/llvm/Analysis/LoopAccessAnalysis.h b/llvm/include/llvm/Analysis/LoopAccessAnalysis.h index 44b7e97..4120263 100644 --- a/llvm/include/llvm/Analysis/LoopAccessAnalysis.h +++ b/llvm/include/llvm/Analysis/LoopAccessAnalysis.h @@ -388,8 +388,8 @@ public: /// \brief Decide if we need to add a check between two groups of pointers, /// according to needsChecking. - bool needsChecking(const CheckingPtrGroup &M, const CheckingPtrGroup &N, - const SmallVectorImpl *PtrPartition) const; + bool needsChecking(const CheckingPtrGroup &M, + const CheckingPtrGroup &N) const; /// \brief Returns the number of run-time checks required according to /// needsChecking. @@ -421,12 +421,7 @@ public: /// \brief Decide whether we need to issue a run-time check for pointer at /// index \p I and \p J to prove their independence. - /// - /// If \p PtrPartition is set, it contains the partition number for - /// pointers (-1 if the pointer belongs to multiple partitions). In this - /// case omit checks between pointers belonging to the same partition. - bool needsChecking(unsigned I, unsigned J, - const SmallVectorImpl *PtrPartition = nullptr) const; + bool needsChecking(unsigned I, unsigned J) const; private: /// \brief Groups pointers such that a single memcheck is required diff --git a/llvm/lib/Analysis/LoopAccessAnalysis.cpp b/llvm/lib/Analysis/LoopAccessAnalysis.cpp index 7ebf76c..541aff5 100644 --- a/llvm/lib/Analysis/LoopAccessAnalysis.cpp +++ b/llvm/lib/Analysis/LoopAccessAnalysis.cpp @@ -171,12 +171,11 @@ void RuntimePointerChecking::generateChecks( Checks = generateChecks(); } -bool RuntimePointerChecking::needsChecking( - const CheckingPtrGroup &M, const CheckingPtrGroup &N, - const SmallVectorImpl *PtrPartition) const { +bool RuntimePointerChecking::needsChecking(const CheckingPtrGroup &M, + const CheckingPtrGroup &N) const { for (unsigned I = 0, EI = M.Members.size(); EI != I; ++I) for (unsigned J = 0, EJ = N.Members.size(); EJ != J; ++J) - if (needsChecking(M.Members[I], N.Members[J], PtrPartition)) + if (needsChecking(M.Members[I], N.Members[J])) return true; return false; } @@ -349,8 +348,7 @@ bool RuntimePointerChecking::arePointersInSamePartition( PtrToPartition[PtrIdx1] == PtrToPartition[PtrIdx2]); } -bool RuntimePointerChecking::needsChecking( - unsigned I, unsigned J, const SmallVectorImpl *PtrPartition) const { +bool RuntimePointerChecking::needsChecking(unsigned I, unsigned J) const { const PointerInfo &PointerI = Pointers[I]; const PointerInfo &PointerJ = Pointers[J]; @@ -366,10 +364,6 @@ bool RuntimePointerChecking::needsChecking( if (PointerI.AliasSetId != PointerJ.AliasSetId) return false; - // If PtrPartition is set omit checks between pointers of the same partition. - if (PtrPartition && arePointersInSamePartition(*PtrPartition, I, J)) - return false; - return true; } -- 2.7.4