Assign scop directly

This makes ScopInfo's scop member available earlier to other methods which will make some planned changes simpler.

No behavioral change intended

llvm-svn: 248879
This commit is contained in:
Michael Kruse 2015-09-30 09:16:07 +00:00
parent 3d11c994f7
commit 76e924d31b
2 changed files with 5 additions and 6 deletions

View File

@ -1596,7 +1596,7 @@ class ScopInfo : public RegionPass {
void clear();
// Build the SCoP for Region @p R.
Scop *buildScop(Region &R, DominatorTree &DT);
void buildScop(Region &R, DominatorTree &DT);
/// @brief Build an instance of MemoryAccess from the Load/Store instruction.
///

View File

@ -3252,9 +3252,9 @@ void ScopInfo::addPHIReadAccess(PHINode *PHI) {
MemoryAccess::PHI);
}
Scop *ScopInfo::buildScop(Region &R, DominatorTree &DT) {
void ScopInfo::buildScop(Region &R, DominatorTree &DT) {
unsigned MaxLoopDepth = getMaxLoopDepthInRegion(R, *LI, *SD);
Scop *S = new Scop(R, AccFuncMap, *SE, DT, ctx, MaxLoopDepth);
scop = new Scop(R, AccFuncMap, *SE, DT, ctx, MaxLoopDepth);
buildAccessFunctions(R, R);
@ -3268,8 +3268,7 @@ Scop *ScopInfo::buildScop(Region &R, DominatorTree &DT) {
if (!R.getExitingBlock())
buildAccessFunctions(R, *R.getExit(), nullptr, /* IsExitBlock */ true);
S->init(*LI, *SD, *AA);
return S;
scop->init(*LI, *SD, *AA);
}
void ScopInfo::print(raw_ostream &OS, const Module *) const {
@ -3324,7 +3323,7 @@ bool ScopInfo::runOnRegion(Region *R, RGPassManager &RGM) {
TD = &F->getParent()->getDataLayout();
DominatorTree &DT = getAnalysis<DominatorTreeWrapperPass>().getDomTree();
scop = buildScop(*R, DT);
buildScop(*R, DT);
DEBUG(scop->print(dbgs()));