maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[LIR] Re-instate r244880, reverted in r244884, factoring the handling of 

AliasAnalysis in LoopIdiomRecognize.

The previous commit to LIR, r244879, exposed some scary bug in the loop
pass pipeline with an assert failure that showed up on several bots.
This patch got reverted as part of getting that revision reverted, but
they're actually independent and unrelated. This patch has no functional
change and should be completely safe. It is also useful for my current
work on the AA infrastructure.

llvm-svn: 244993
This commit is contained in:
Chandler Carruth 2015-08-14 00:21:10 +00:00
parent 5da0dde965
commit bf143e2a20
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp
View File

@ -69,6 +69,7 @@ namespace {
class LoopIdiomRecognize : public LoopPass { class LoopIdiomRecognize : public LoopPass {
Loop *CurLoop; Loop *CurLoop;
AliasAnalysis *AA;
DominatorTree *DT; DominatorTree *DT;
LoopInfo *LI; LoopInfo *LI;
ScalarEvolution *SE; ScalarEvolution *SE;
@ -188,6 +189,7 @@ bool LoopIdiomRecognize::runOnLoop(Loop *L, LPPassManager &LPM) {
if (Name == "memset" || Name == "memcpy") if (Name == "memset" || Name == "memcpy")
return false; return false;
AA = &getAnalysis<AliasAnalysis>();
DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree(); DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo(); LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
SE = &getAnalysis<ScalarEvolution>(); SE = &getAnalysis<ScalarEvolution>();
@ -505,7 +507,7 @@ bool LoopIdiomRecognize::processLoopStridedStore(
Preheader->getTerminator()); Preheader->getTerminator());
if (mayLoopAccessLocation(BasePtr, MRI_ModRef, CurLoop, BECount, StoreSize, if (mayLoopAccessLocation(BasePtr, MRI_ModRef, CurLoop, BECount, StoreSize,
getAnalysis<AliasAnalysis>(), TheStore)) { *AA, TheStore)) {
Expander.clear(); Expander.clear();
// If we generated new code for the base pointer, clean up. // If we generated new code for the base pointer, clean up.
RecursivelyDeleteTriviallyDeadInstructions(BasePtr, TLI); RecursivelyDeleteTriviallyDeadInstructions(BasePtr, TLI);
@ -594,7 +596,7 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
Preheader->getTerminator()); Preheader->getTerminator());
if (mayLoopAccessLocation(StoreBasePtr, MRI_ModRef, CurLoop, BECount, if (mayLoopAccessLocation(StoreBasePtr, MRI_ModRef, CurLoop, BECount,
StoreSize, getAnalysis<AliasAnalysis>(), SI)) { StoreSize, *AA, SI)) {
Expander.clear(); Expander.clear();
// If we generated new code for the base pointer, clean up. // If we generated new code for the base pointer, clean up.
RecursivelyDeleteTriviallyDeadInstructions(StoreBasePtr, TLI); RecursivelyDeleteTriviallyDeadInstructions(StoreBasePtr, TLI);
@ -608,7 +610,7 @@ bool LoopIdiomRecognize::processLoopStoreOfLoopLoad(
Preheader->getTerminator()); Preheader->getTerminator());
if (mayLoopAccessLocation(LoadBasePtr, MRI_Mod, CurLoop, BECount, StoreSize, if (mayLoopAccessLocation(LoadBasePtr, MRI_Mod, CurLoop, BECount, StoreSize,
getAnalysis<AliasAnalysis>(), SI)) { *AA, SI)) {
Expander.clear(); Expander.clear();
// If we generated new code for the base pointer, clean up. // If we generated new code for the base pointer, clean up.
RecursivelyDeleteTriviallyDeadInstructions(LoadBasePtr, TLI); RecursivelyDeleteTriviallyDeadInstructions(LoadBasePtr, TLI);