diff options
| -rw-r--r-- | llvm/lib/Transforms/Utils/InlineFunction.cpp | 1 | ||||
| -rw-r--r-- | llvm/test/Transforms/Inline/2010-05-31-ByvalTailcall.ll | 3 | ||||
| -rw-r--r-- | llvm/test/Transforms/Inline/byval_lifetime.ll | 26 |
3 files changed, 29 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp index b2262dca741..5692d91c86e 100644 --- a/llvm/lib/Transforms/Utils/InlineFunction.cpp +++ b/llvm/lib/Transforms/Utils/InlineFunction.cpp @@ -394,6 +394,7 @@ static Value *HandleByValArgument(Value *Arg, Instruction *TheCall, Value *NewAlloca = new AllocaInst(AggTy, 0, Align, Arg->getName(), &*Caller->begin()->begin()); + IFI.StaticAllocas.push_back(cast<AllocaInst>(NewAlloca)); // Uses of the argument in the function should use our new alloca // instead. diff --git a/llvm/test/Transforms/Inline/2010-05-31-ByvalTailcall.ll b/llvm/test/Transforms/Inline/2010-05-31-ByvalTailcall.ll index b37b9f2ffa2..07ea5fc6cc1 100644 --- a/llvm/test/Transforms/Inline/2010-05-31-ByvalTailcall.ll +++ b/llvm/test/Transforms/Inline/2010-05-31-ByvalTailcall.ll @@ -18,7 +18,8 @@ define void @bar(i32* byval %x) { define void @foo(i32* %x) { ; CHECK-LABEL: define void @foo( -; CHECK: store i32 %1, i32* %x +; CHECK: llvm.lifetime.start +; CHECK: store i32 %2, i32* %x call void @bar(i32* byval %x) ret void } diff --git a/llvm/test/Transforms/Inline/byval_lifetime.ll b/llvm/test/Transforms/Inline/byval_lifetime.ll new file mode 100644 index 00000000000..e8dff2aa711 --- /dev/null +++ b/llvm/test/Transforms/Inline/byval_lifetime.ll @@ -0,0 +1,26 @@ +; RUN: opt -S -inline < %s | FileCheck %s +; END. + +; By inlining foo, an alloca is created in main to hold the byval argument, so +; a lifetime marker should be generated as well by default. + +%struct.foo = type { i32, [16 x i32] } + +@gFoo = global %struct.foo zeroinitializer, align 8 + +define i32 @foo(%struct.foo* byval align 8 %f, i32 %a) { +entry: + %a1 = getelementptr inbounds %struct.foo* %f, i32 0, i32 1 + %arrayidx = getelementptr inbounds [16 x i32]* %a1, i32 0, i32 %a + %tmp2 = load i32* %arrayidx, align 1 + ret i32 %tmp2 +} + +define i32 @main(i32 %argc, i8** %argv) { +; CHECK-LABEL: @main +; CHECK: llvm.lifetime.start +; CHECK: memcpy +entry: + %call = call i32 @foo(%struct.foo* byval align 8 @gFoo, i32 %argc) + ret i32 %call +} |
