Don't use an induction variable type as a memory access type.

Use VoidTy instead, to be properly conservative.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66463 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/lib/Transforms/Scalar/LoopStrengthReduce.cpp
index c465a076e2c03c78051a91f0571ab448f56fd67b..b64c689df599ce1385b376360cdc4cb8156f9f0c 100644 (file)
--- a/lib/Transforms/Scalar/LoopStrengthReduce.cpp
+++ b/lib/Transforms/Scalar/LoopStrengthReduce.cpp
@@ -1774,7 +1774,7 @@ LoopStrengthReduce::PrepareToStrengthReduceFromSmallerStride(
 }
 
 static bool IsImmFoldedIntoAddrMode(GlobalValue *GV, int64_t Offset,
-                                    const Type *ReplacedTy,
+                                    const Type *AccessTy,
                                    std::vector<BasedUser> &UsersToProcess,
                                    const TargetLowering *TLI) {
   SmallVector<Instruction*, 16> AddrModeInsts;
@@ -1783,7 +1783,7 @@ static bool IsImmFoldedIntoAddrMode(GlobalValue *GV, int64_t Offset,
       continue;
     ExtAddrMode AddrMode =
       AddressingModeMatcher::Match(UsersToProcess[i].OperandValToReplace,
-                                   ReplacedTy, UsersToProcess[i].Inst,
+                                   AccessTy, UsersToProcess[i].Inst,
                                    AddrModeInsts, *TLI);
     if (GV && GV != AddrMode.BaseGV)
       return false;
@@ -1858,7 +1858,9 @@ void LoopStrengthReduce::StrengthReduceStridedIVUsers(const SCEVHandle &Stride,
       if (SCEVConstant *SC = dyn_cast<SCEVConstant>(Imm))
         Offset = SC->getValue()->getSExtValue();
       if (GV || Offset)
-        DoSink = IsImmFoldedIntoAddrMode(GV, Offset, ReplacedTy,
+        // Pass VoidTy as the AccessTy to be conservative, because
+        // there could be multiple access types among all the uses.
+        DoSink = IsImmFoldedIntoAddrMode(GV, Offset, Type::VoidTy,
                                          UsersToProcess, TLI);
 
       if (DoSink) {