diff options
| -rw-r--r-- | llvm/include/llvm/Analysis/LoopAccessAnalysis.h | 10 | ||||
| -rw-r--r-- | llvm/lib/Analysis/LoopAccessAnalysis.cpp | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/llvm/include/llvm/Analysis/LoopAccessAnalysis.h b/llvm/include/llvm/Analysis/LoopAccessAnalysis.h index 2d88e6dfbee..f83334ac8df 100644 --- a/llvm/include/llvm/Analysis/LoopAccessAnalysis.h +++ b/llvm/include/llvm/Analysis/LoopAccessAnalysis.h @@ -522,9 +522,9 @@ public: LoopAccessInfo(LoopAccessInfo &&LAI) : PSE(std::move(LAI.PSE)), PtrRtChecking(std::move(LAI.PtrRtChecking)), DepChecker(std::move(LAI.DepChecker)), TheLoop(LAI.TheLoop), DL(LAI.DL), - TLI(LAI.TLI), AA(LAI.AA), DT(LAI.DT), LI(LAI.LI), - NumLoads(LAI.NumLoads), NumStores(LAI.NumStores), - MaxSafeDepDistBytes(LAI.MaxSafeDepDistBytes), CanVecMem(LAI.CanVecMem), + TLI(LAI.TLI), DT(LAI.DT), LI(LAI.LI), NumLoads(LAI.NumLoads), + NumStores(LAI.NumStores), MaxSafeDepDistBytes(LAI.MaxSafeDepDistBytes), + CanVecMem(LAI.CanVecMem), StoreToLoopInvariantAddress(LAI.StoreToLoopInvariantAddress), Report(std::move(LAI.Report)), SymbolicStrides(std::move(LAI.SymbolicStrides)), @@ -539,7 +539,6 @@ public: TheLoop = LAI.TheLoop; DL = LAI.DL; TLI = LAI.TLI; - AA = LAI.AA; DT = LAI.DT; LI = LAI.LI; NumLoads = LAI.NumLoads; @@ -638,7 +637,7 @@ public: private: /// \brief Analyze the loop. - void analyzeLoop(); + void analyzeLoop(AliasAnalysis *AA); /// \brief Check if the structure of the loop allows it to be analyzed by this /// pass. @@ -665,7 +664,6 @@ private: Loop *TheLoop; const DataLayout *DL; const TargetLibraryInfo *TLI; - AliasAnalysis *AA; DominatorTree *DT; LoopInfo *LI; diff --git a/llvm/lib/Analysis/LoopAccessAnalysis.cpp b/llvm/lib/Analysis/LoopAccessAnalysis.cpp index e889e2d2c1f..bc145c87e2f 100644 --- a/llvm/lib/Analysis/LoopAccessAnalysis.cpp +++ b/llvm/lib/Analysis/LoopAccessAnalysis.cpp @@ -1505,7 +1505,7 @@ bool LoopAccessInfo::canAnalyzeLoop() { return true; } -void LoopAccessInfo::analyzeLoop() { +void LoopAccessInfo::analyzeLoop(AliasAnalysis *AA) { typedef SmallPtrSet<Value*, 16> ValueSet; // Holds the Load and Store instructions. @@ -1921,11 +1921,11 @@ LoopAccessInfo::LoopAccessInfo(Loop *L, ScalarEvolution *SE, : PSE(llvm::make_unique<PredicatedScalarEvolution>(*SE, *L)), PtrRtChecking(llvm::make_unique<RuntimePointerChecking>(SE)), DepChecker(llvm::make_unique<MemoryDepChecker>(*PSE, L)), TheLoop(L), - DL(&DL), TLI(TLI), AA(AA), DT(DT), LI(LI), NumLoads(0), NumStores(0), + DL(&DL), TLI(TLI), DT(DT), LI(LI), NumLoads(0), NumStores(0), MaxSafeDepDistBytes(-1), CanVecMem(false), StoreToLoopInvariantAddress(false) { if (canAnalyzeLoop()) - analyzeLoop(); + analyzeLoop(AA); } void LoopAccessInfo::print(raw_ostream &OS, unsigned Depth) const { |
