[PATCH] D52609: [SROA] Use offset sizes from the DataLayout instead of the pointer siezes.
Nicola Zaghen via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Sep 27 05:30:28 PDT 2018
Nicola created this revision.
Nicola added reviewers: delena, efriedma.
Herald added a subscriber: llvm-commits.
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.
Repository:
rL LLVM
https://reviews.llvm.org/D52609
Files:
lib/Transforms/Scalar/SROA.cpp
test/Transforms/SROA/pointer-offset-size.ll
Index: test/Transforms/SROA/pointer-offset-size.ll
===================================================================
--- /dev/null
+++ test/Transforms/SROA/pointer-offset-size.ll
@@ -0,0 +1,19 @@
+; RUN: opt < %s -sroa -S
+target datalayout = "e-p:64:64:64:32"
+
+%struct.test = type { %struct.basic, %struct.basic }
+%struct.basic = type { i16, i8 }
+
+define void @test() {
+entry:
+ %ts2.i = alloca %struct.test
+ %s = alloca %struct.test
+ %0 = bitcast %struct.test* %ts2.i to i8*
+ %1 = bitcast %struct.test* %s to i8*
+ call void @llvm.memcpy.p0i8.p0i8.i32(i8* %0, i8* %1, i32 3, i1 false)
+ %x1.i.i = getelementptr inbounds %struct.test, %struct.test* %ts2.i, i32 0, i32 0, i32 0
+ %2 = load i16, i16* %x1.i.i
+ ret void
+}
+
+declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture writeonly, i8* nocapture readonly, i32, i1)
Index: lib/Transforms/Scalar/SROA.cpp
===================================================================
--- lib/Transforms/Scalar/SROA.cpp
+++ lib/Transforms/Scalar/SROA.cpp
@@ -1400,8 +1400,8 @@
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 @@
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 @@
#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 @@
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,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D52609.167291.patch
Type: text/x-patch
Size: 2755 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180927/f5735cc8/attachment.bin>
More information about the llvm-commits
mailing list