2 files changed, 28 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp b/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
index aa722dbb286..b014747cbc1 100644
--- a/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
+++ b/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
@@ -816,6 +816,14 @@ static void visitIVCast(CastInst *Cast, WideIVInfo &WI, ScalarEvolution *SE,
   if (!Cast->getModule()->getDataLayout().isLegalInteger(Width))
     return;
 
+  // Check that `Cast` actually extends the induction variable (we rely on this
+  // later).  This takes care of cases where `Cast` is extending a truncation of
+  // the narrow induction variable, and thus can end up being narrower than the
+  // "narrow" induction variable.
+  uint64_t NarrowIVWidth = SE->getTypeSizeInBits(WI.NarrowIV->getType());
+  if (NarrowIVWidth >= Width)
+    return;
+
   // Cast is either an sext or zext up to this point.
   // We should not widen an indvar if arithmetics on the wider indvar are more
   // expensive than those on the narrower indvar. We check only the cost of ADD
diff --git a/llvm/test/Transforms/IndVarSimplify/pr28935.ll b/llvm/test/Transforms/IndVarSimplify/pr28935.ll
new file mode 100644
index 00000000000..0cfd1d31a41
--- /dev/null
+++ b/llvm/test/Transforms/IndVarSimplify/pr28935.ll
@@ -0,0 +1,20 @@
+; RUN: opt -S -indvars < %s | FileCheck %s
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+declare i16 @fn1(i16 returned, i64)
+
+define void @fn2() {
+; CHECK-LABEL: @fn2(
+entry:
+  br label %for.cond
+
+for.cond:
+  %f.0 = phi i64 [ undef, %entry ], [ %inc, %for.cond ]
+  %conv = trunc i64 %f.0 to i16
+  %call = tail call i16 @fn1(i16 %conv, i64 %f.0)
+  %conv2 = zext i16 %call to i32
+  %inc = add nsw i64 %f.0, 1
+  br label %for.cond
+}