diff options
| author | Nicola Zaghen <nicola.zaghen@imgtec.com> | 2018-10-30 11:15:04 +0000 |
|---|---|---|
| committer | Nicola Zaghen <nicola.zaghen@imgtec.com> | 2018-10-30 11:15:04 +0000 |
| commit | f96383c99e51b793247b4c82fc4fe1c62f6b28d3 (patch) | |
| tree | 1c48f203ab3f4f05b207cf4d450aac6afa9fbba7 /llvm/lib | |
| parent | b3a14208ac3cdb27588992a7c988b02c981c0586 (diff) | |
| download | bcm5719-llvm-f96383c99e51b793247b4c82fc4fe1c62f6b28d3.tar.gz bcm5719-llvm-f96383c99e51b793247b4c82fc4fe1c62f6b28d3.zip | |
[SROA] Use offset sizes from the DataLayout instead of the pointer siezes.
This fixes an assertion when constant folding a GEP when the part of the offset
was in i32 (IndexSize, as per DataLayout) and part in the i64 (PointerSize) in
the newly created test case.
Differential Revision: https://reviews.llvm.org/D52609
llvm-svn: 345585
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Transforms/Scalar/SROA.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/Transforms/Scalar/SROA.cpp b/llvm/lib/Transforms/Scalar/SROA.cpp index 0f43ee6bbd7..a8b9ee56639 100644 --- a/llvm/lib/Transforms/Scalar/SROA.cpp +++ b/llvm/lib/Transforms/Scalar/SROA.cpp @@ -1400,8 +1400,8 @@ static Value *getNaturalGEPWithType(IRBuilderTy &IRB, const DataLayout &DL, if (Ty == TargetTy) return buildGEP(IRB, BasePtr, Indices, NamePrefix); - // Pointer size to use for the indices. - unsigned PtrSize = DL.getPointerTypeSizeInBits(BasePtr->getType()); + // Offset size to use for the indices. + unsigned OffsetSize = DL.getIndexTypeSizeInBits(BasePtr->getType()); // See if we can descend into a struct and locate a field with the correct // type. @@ -1413,7 +1413,7 @@ static Value *getNaturalGEPWithType(IRBuilderTy &IRB, const DataLayout &DL, if (ArrayType *ArrayTy = dyn_cast<ArrayType>(ElementTy)) { ElementTy = ArrayTy->getElementType(); - Indices.push_back(IRB.getIntN(PtrSize, 0)); + Indices.push_back(IRB.getIntN(OffsetSize, 0)); } else if (VectorType *VectorTy = dyn_cast<VectorType>(ElementTy)) { ElementTy = VectorTy->getElementType(); Indices.push_back(IRB.getInt32(0)); @@ -2377,7 +2377,7 @@ private: #endif return getAdjustedPtr(IRB, DL, &NewAI, - APInt(DL.getPointerTypeSizeInBits(PointerTy), Offset), + APInt(DL.getIndexTypeSizeInBits(PointerTy), Offset), PointerTy, #ifndef NDEBUG Twine(OldName) + "." @@ -2899,8 +2899,8 @@ private: unsigned OtherAS = OtherPtrTy->getPointerAddressSpace(); // Compute the relative offset for the other pointer within the transfer. - unsigned IntPtrWidth = DL.getPointerSizeInBits(OtherAS); - APInt OtherOffset(IntPtrWidth, NewBeginOffset - BeginOffset); + unsigned OffsetWidth = DL.getIndexSizeInBits(OtherAS); + APInt OtherOffset(OffsetWidth, NewBeginOffset - BeginOffset); unsigned OtherAlign = IsDest ? II.getSourceAlignment() : II.getDestAlignment(); OtherAlign = MinAlign(OtherAlign ? OtherAlign : 1, |
