From 60fb899f28c7cde25341ea87f32f3be9f440983a Mon Sep 17 00:00:00 2001
From: Sanjoy Das <sanjoy@playingwithpointers.com>
Date: Fri, 18 Mar 2016 20:37:07 +0000
Subject: [PATCH] [IndVars] Pass the right loop to isLoopInvariantPredicate

The loop on IVOperand's incoming values assumes IVOperand to be an
induction variable on the loop over which `S Pred X` is invariant;
otherwise loop invariant incoming values to IVOperand are not guaranteed
to dominate the comparision.

This fixes PR26973.

llvm-svn: 263827
---
 llvm/lib/Transforms/Utils/SimplifyIndVar.cpp   |  5 ++--
 llvm/test/Transforms/IndVarSimplify/pr26973.ll | 33 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 llvm/test/Transforms/IndVarSimplify/pr26973.ll

diff --git a/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp b/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp
index ddd8775..fe5d8e4 100644
--- a/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyIndVar.cpp
@@ -183,9 +183,8 @@ void SimplifyIndvar::eliminateIVComparison(ICmpInst *ICmp, Value *IVOperand) {
     DeadInsts.emplace_back(ICmp);
     DEBUG(dbgs() << "INDVARS: Eliminated comparison: " << *ICmp << '\n');
   } else if (isa<PHINode>(IVOperand) &&
-             SE->isLoopInvariantPredicate(Pred, S, X, ICmpLoop,
-                                          InvariantPredicate, InvariantLHS,
-                                          InvariantRHS)) {
+             SE->isLoopInvariantPredicate(Pred, S, X, L, InvariantPredicate,
+                                          InvariantLHS, InvariantRHS)) {
 
     // Rewrite the comparison to a loop invariant comparison if it can be done
     // cheaply, where cheaply means "we don't need to emit any new
diff --git a/llvm/test/Transforms/IndVarSimplify/pr26973.ll b/llvm/test/Transforms/IndVarSimplify/pr26973.ll
new file mode 100644
index 0000000..8bad303
--- /dev/null
+++ b/llvm/test/Transforms/IndVarSimplify/pr26973.ll
@@ -0,0 +1,33 @@
+; RUN: opt -S -indvars < %s | FileCheck %s
+
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.11.0"
+
+@a = common global double* null, align 8
+@b = common global double 0.000000e+00, align 8
+
+define void @fn1(i32 %p1) {
+; CHECK-LABEL: @fn1(
+entry:
+  %ld = load double*, double** @a, align 8
+  br label %outer.loop
+
+outer.loop:
+  %iv.outer = phi i32 [ %p1, %entry ], [ %iv.outer.dec, %outer.be ]
+  %idxprom = sext i32 %iv.outer to i64
+  %arrayidx = getelementptr inbounds double, double* %ld, i64 %idxprom
+  %arrayidx.bc = bitcast double* %arrayidx to i64*
+  br label %inner.loop
+
+inner.loop:
+  %iv.inner = phi i32 [ %iv.outer, %outer.loop ], [ %iv.inner.dec, %inner.loop ]
+  %ld.arr = load i64, i64* %arrayidx.bc, align 8
+  store i64 %ld.arr, i64* bitcast (double* @b to i64*), align 8
+  %iv.inner.dec = add nsw i32 %iv.inner, -1
+  %cmp = icmp slt i32 %iv.outer, %iv.inner.dec
+  br i1 %cmp, label %outer.be, label %inner.loop
+
+outer.be:
+  %iv.outer.dec = add nsw i32 %iv.outer, -1
+  br label %outer.loop
+}
-- 
2.7.4