diff --git a/llvm/include/llvm/Analysis/LoopAccessAnalysis.h b/llvm/include/llvm/Analysis/LoopAccessAnalysis.h --- a/llvm/include/llvm/Analysis/LoopAccessAnalysis.h +++ b/llvm/include/llvm/Analysis/LoopAccessAnalysis.h @@ -541,15 +541,8 @@ unsigned getNumStores() const { return NumStores; } unsigned getNumLoads() const { return NumLoads;} - /// Add code that checks at runtime if the accessed arrays overlap. - /// - /// Returns a pair of instructions where the first element is the first - /// instruction generated in possibly a sequence of instructions and the - /// second value is the final comparator value or NULL if no check is needed. - std::pair - addRuntimeChecks(Instruction *Loc) const; - - /// Generete the instructions for the checks in \p PointerChecks. + /// Add code that checks at runtime if the accessed arrays \in p PointerChecks + /// overlap. /// /// Returns a pair of instructions where the first element is the first /// instruction generated in possibly a sequence of instructions and the diff --git a/llvm/lib/Analysis/LoopAccessAnalysis.cpp b/llvm/lib/Analysis/LoopAccessAnalysis.cpp --- a/llvm/lib/Analysis/LoopAccessAnalysis.cpp +++ b/llvm/lib/Analysis/LoopAccessAnalysis.cpp @@ -2275,14 +2275,6 @@ return std::make_pair(FirstInst, Check); } -std::pair -LoopAccessInfo::addRuntimeChecks(Instruction *Loc) const { - if (!PtrRtChecking->Need) - return std::make_pair(nullptr, nullptr); - - return addRuntimeChecks(Loc, PtrRtChecking->getChecks()); -} - void LoopAccessInfo::collectStridedAccess(Value *MemAccess) { Value *Ptr = nullptr; if (LoadInst *LI = dyn_cast(MemAccess)) diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp --- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -2785,12 +2785,15 @@ // Generate the code that checks in runtime if arrays overlap. We put the // checks into a separate block to make the more common case of few elements // faster. + auto *LAI = Legal->getLAI(); + const auto &RtPtrChecking = *LAI->getRuntimePointerChecking(); + if (!RtPtrChecking.Need) + return; Instruction *FirstCheckInst; Instruction *MemRuntimeCheck; - std::tie(FirstCheckInst, MemRuntimeCheck) = - Legal->getLAI()->addRuntimeChecks(MemCheckBlock->getTerminator()); - if (!MemRuntimeCheck) - return; + std::tie(FirstCheckInst, MemRuntimeCheck) = LAI->addRuntimeChecks( + MemCheckBlock->getTerminator(), RtPtrChecking.getChecks()); + assert(MemRuntimeCheck && "Expected runtime checks to be generated"); if (MemCheckBlock->getParent()->hasOptSize()) { assert(Cost->Hints->getForce() == LoopVectorizeHints::FK_Enabled &&