1 files changed, 3 insertions, 2 deletions
diff --git a/polly/lib/IndVarSimplify.cpp b/polly/lib/IndVarSimplify.cpp
index a7d96f434d8..91ea2aac46c 100644
--- a/polly/lib/IndVarSimplify.cpp
+++ b/polly/lib/IndVarSimplify.cpp
@@ -69,7 +69,7 @@ class PollyIndVarSimplify : public LoopPass {
   LoopInfo *LI;
   ScalarEvolution *SE;
   DominatorTree *DT;
-  DataLayout *TD;
+  const DataLayout *TD;
 
   SmallVector<WeakVH, 16> DeadInsts;
   bool Changed;
@@ -1809,7 +1809,8 @@ bool PollyIndVarSimplify::runOnLoop(Loop *L, LPPassManager &LPM) {
   LI = &getAnalysis<LoopInfo>();
   SE = &getAnalysis<ScalarEvolution>();
   DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
-  TD = getAnalysisIfAvailable<DataLayout>();
+  DataLayoutPass *DLP = getAnalysisIfAvailable<DataLayoutPass>();
+  TD = DLP ? &DLP->getDataLayout() : 0;
 
   DeadInsts.clear();
   Changed = false;