!fixup use new getGEPExpr.

Author: fhahn

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

@@ -3336,7 +3336,6 @@ InstructionCost VPReplicateRecipe::computeCost(ElementCount VF,
         UI->getOpcode(), ValTy, Alignment, AS, Ctx.CostKind, OpInfo);
 
     Type *PtrTy = isSingleScalar() ? ScalarPtrTy : toVectorTy(ScalarPtrTy, VF);
-
     bool PreferVectorizedAddressing = Ctx.TTI.prefersVectorizedAddressing();
     bool UsedByLoadStoreAddress =
         !PreferVectorizedAddressing && isUsedByLoadStoreAddress(this);

llvm/lib/Transforms/Vectorize/VPlanUtils.cpp

@@ -119,55 +119,17 @@ const SCEV *vputils::getSCEVExprForVPValue(const VPValue *V,
         if (isa<SCEVCouldNotCompute>(Base))
           return SE.getCouldNotCompute();
 
-        Type *IntIdxTy = SE.getEffectiveSCEVType(Base->getType());
-        Type *CurTy = IntIdxTy;
-        bool FirstIter = true;
-        SmallVector<const SCEV *, 4> Offsets;
+        SmallVector<const SCEV *> IndexExprs;
         for (VPValue *Index : drop_begin(R->operands())) {
           const SCEV *IndexExpr = getSCEVExprForVPValue(Index, SE, L);
           if (isa<SCEVCouldNotCompute>(IndexExpr))
             return SE.getCouldNotCompute();
-          // Compute the (potentially symbolic) offset in bytes for this index.
-          if (StructType *STy = dyn_cast<StructType>(CurTy)) {
-            // For a struct, add the member offset.
-            ConstantInt *Index = cast<SCEVConstant>(IndexExpr)->getValue();
-            unsigned FieldNo = Index->getZExtValue();
-            const SCEV *FieldOffset =
-                SE.getOffsetOfExpr(IntIdxTy, STy, FieldNo);
-            Offsets.push_back(FieldOffset);
-
-            // Update CurTy to the type of the field at Index.
-            CurTy = STy->getTypeAtIndex(Index);
-          } else {
-            // Update CurTy to its element type.
-            if (FirstIter) {
-              CurTy = cast<GetElementPtrInst>(R->getUnderlyingInstr())
-                          ->getSourceElementType();
-              FirstIter = false;
-            } else {
-              CurTy = GetElementPtrInst::getTypeAtIndex(CurTy, (uint64_t)0);
-            }
-            // For an array, add the element offset, explicitly scaled.
-            const SCEV *ElementSize = SE.getSizeOfExpr(IntIdxTy, CurTy);
-            // Getelementptr indices are signed.
-            IndexExpr = SE.getTruncateOrSignExtend(IndexExpr, IntIdxTy);
-
-            // Multiply the index by the element size to compute the element
-            // offset.
-            const SCEV *LocalOffset = SE.getMulExpr(IndexExpr, ElementSize);
-            Offsets.push_back(LocalOffset);
-          }
+          IndexExprs.push_back(IndexExpr);
         }
-        // Handle degenerate case of GEP without offsets.
-        if (Offsets.empty())
-          return Base;
-
-        // Add the offsets together, assuming nsw if inbounds.
-        const SCEV *Offset = SE.getAddExpr(Offsets);
-        // Add the base address and the offset. We cannot use the nsw flag, as
-        // the base address is unsigned. However, if we know that the offset is
-        // non-negative, we can use nuw.
-        return SE.getAddExpr(Base, Offset);
+
+        Type *SrcElementTy = cast<GetElementPtrInst>(R->getUnderlyingInstr())
+                                 ->getSourceElementType();
+        return SE.getGEPExpr(Base, IndexExprs, SrcElementTy, SCEV::FlagAnyWrap);
       })
       .Default([&SE](const VPRecipeBase *) { return SE.getCouldNotCompute(); });
 }