diff options
| -rw-r--r-- | lib/Transforms/Scalar/ScalarReplAggregates.cpp | 4 | ||||
| -rw-r--r-- | test/Transforms/ScalarRepl/2009-02-05-LoadFCA.ll | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/lib/Transforms/Scalar/ScalarReplAggregates.cpp index c1c8e0387c..a396dc4ff8 100644 --- a/lib/Transforms/Scalar/ScalarReplAggregates.cpp +++ b/lib/Transforms/Scalar/ScalarReplAggregates.cpp @@ -1431,7 +1431,7 @@ Value *SROA::ConvertScalar_ExtractValue(Value *FromVal, const Type *ToType, Value *Res = UndefValue::get(ST); for (unsigned i = 0, e = ST->getNumElements(); i != e; ++i) { Value *Elt = ConvertScalar_ExtractValue(FromVal, ST->getElementType(i), - Offset+Layout.getElementOffset(i), + Offset+Layout.getElementOffsetInBits(i), Builder); Res = Builder.CreateInsertValue(Res, Elt, i, "tmp"); } @@ -1538,7 +1538,7 @@ Value *SROA::ConvertScalar_InsertValue(Value *SV, Value *Old, for (unsigned i = 0, e = ST->getNumElements(); i != e; ++i) { Value *Elt = Builder.CreateExtractValue(SV, i, "tmp"); Old = ConvertScalar_InsertValue(Elt, Old, - Offset+Layout.getElementOffset(i), + Offset+Layout.getElementOffsetInBits(i), Builder); } return Old; diff --git a/test/Transforms/ScalarRepl/2009-02-05-LoadFCA.ll b/test/Transforms/ScalarRepl/2009-02-05-LoadFCA.ll new file mode 100644 index 0000000000..3bea5738ab --- /dev/null +++ b/test/Transforms/ScalarRepl/2009-02-05-LoadFCA.ll @@ -0,0 +1,20 @@ +; RUN: llvm-as < %s | opt -scalarrepl -instcombine -inline -instcombine | llvm-dis | grep {ret i32 42} +; PR3489 +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128" +target triple = "x86_64-apple-darwin10.0" + %struct.anon = type <{ i32, i32, i32 }> + +define i32 @f({ i64, i64 }) nounwind { +entry: + %tmp = alloca { i64, i64 }, align 8 ; <{ i64, i64 }*> [#uses=2] + store { i64, i64 } %0, { i64, i64 }* %tmp + %1 = bitcast { i64, i64 }* %tmp to %struct.anon* ; <%struct.anon*> [#uses=1] + %2 = load %struct.anon* %1, align 8 ; <%struct.anon> [#uses=1] + %tmp3 = extractvalue %struct.anon %2, 0 + ret i32 %tmp3 +} + +define i32 @g() { + %a = call i32 @f({i64,i64} { i64 42, i64 1123123123123123 }) + ret i32 %a +} |