diff options
4 files changed, 2 insertions, 25 deletions
diff --git a/llvm/lib/Transforms/IPO/MergeFunctions.cpp b/llvm/lib/Transforms/IPO/MergeFunctions.cpp index a0654bd68cf..109cac7fece 100644 --- a/llvm/lib/Transforms/IPO/MergeFunctions.cpp +++ b/llvm/lib/Transforms/IPO/MergeFunctions.cpp @@ -1361,7 +1361,6 @@ void MergeFunctions::writeThunk(Function *F, Function *G) { CallInst *CI = Builder.CreateCall(F, Args); CI->setTailCall(); CI->setCallingConv(F->getCallingConv()); - CI->setAttributes(F->getAttributes()); if (NewG->getReturnType()->isVoidTy()) { Builder.CreateRetVoid(); } else { diff --git a/llvm/test/Transforms/MergeFunc/apply_function_attributes.ll b/llvm/test/Transforms/MergeFunc/apply_function_attributes.ll deleted file mode 100644 index 9995d155fb1..00000000000 --- a/llvm/test/Transforms/MergeFunc/apply_function_attributes.ll +++ /dev/null @@ -1,22 +0,0 @@ -; RUN: opt -S -mergefunc < %s | FileCheck %s -%Si = type <{ i32 }> - -define void @sum(%Si* noalias sret %a, i32 %x, i32 %y) { - %sum = add i32 %x, %y - %sum2 = add i32 %sum, %y - %sum3 = add i32 %sum2, %y - ret void -} - -define void @add(%Si* noalias sret %a, i32 %x, i32 %y) { - %sum = add i32 %x, %y - %sum2 = add i32 %sum, %y - %sum3 = add i32 %sum2, %y - ret void -} - -; Make sure we transfer the parameter attributes to the call site. - -; CHECK-LABEL: define void @sum(%Si* noalias sret, i32, i32) -; CHECK: tail call void @add(%Si* noalias sret %{{.*}}, i32 %{{.*}}, i32 %{{.*}}) -; CHECK: ret void diff --git a/llvm/test/Transforms/MergeFunc/inttoptr-address-space.ll b/llvm/test/Transforms/MergeFunc/inttoptr-address-space.ll index 86deb2c9495..5f672debd91 100644 --- a/llvm/test/Transforms/MergeFunc/inttoptr-address-space.ll +++ b/llvm/test/Transforms/MergeFunc/inttoptr-address-space.ll @@ -21,7 +21,7 @@ define internal i8* @func35(%.qux.2585 addrspace(1)* nocapture %this) align 2 { bb: ; CHECK-LABEL: @func35( ; CHECK: %[[V2:.+]] = bitcast %.qux.2585 addrspace(1)* %{{.*}} to %.qux.2496 addrspace(1)* -; CHECK: %[[V3:.+]] = tail call i32 @func10(%.qux.2496 addrspace(1)* nocapture %[[V2]]) +; CHECK: %[[V3:.+]] = tail call i32 @func10(%.qux.2496 addrspace(1)* %[[V2]]) ; CHECK: %{{.*}} = inttoptr i32 %[[V3]] to i8* %tmp = getelementptr inbounds %.qux.2585, %.qux.2585 addrspace(1)* %this, i32 0, i32 2 %tmp1 = load i8*, i8* addrspace(1)* %tmp, align 4 diff --git a/llvm/test/Transforms/MergeFunc/inttoptr.ll b/llvm/test/Transforms/MergeFunc/inttoptr.ll index 05ae766a6e3..0abbf6239a3 100644 --- a/llvm/test/Transforms/MergeFunc/inttoptr.ll +++ b/llvm/test/Transforms/MergeFunc/inttoptr.ll @@ -48,7 +48,7 @@ define internal i8* @func35(%.qux.2585* nocapture %this) align 2 { bb: ; CHECK-LABEL: @func35( ; CHECK: %[[V2:.+]] = bitcast %.qux.2585* %{{.*}} to %.qux.2496* -; CHECK: %[[V3:.+]] = tail call i32 @func10(%.qux.2496* nocapture %[[V2]]) +; CHECK: %[[V3:.+]] = tail call i32 @func10(%.qux.2496* %[[V2]]) ; CHECK: %{{.*}} = inttoptr i32 %[[V3]] to i8* %tmp = getelementptr inbounds %.qux.2585, %.qux.2585* %this, i32 0, i32 2 %tmp1 = load i8*, i8** %tmp, align 4 |
