[LowerGuardIntrinsics] Preserve calling conv when lowering

llvm-svn: 268142

2 files changed, 17 insertions, 0 deletions

diff --git a/llvm/lib/Transforms/Scalar/LowerGuardIntrinsic.cpp b/llvm/lib/Transforms/Scalar/LowerGuardIntrinsic.cpp
index 5f5dd197b44..a58346c2b1c 100644
--- a/llvm/lib/Transforms/Scalar/LowerGuardIntrinsic.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerGuardIntrinsic.cpp
@@ -66,6 +66,7 @@ static void MakeGuardControlFlowExplicit(Function *DeoptIntrinsic,
     B.CreateRet(DeoptCall);
   }
 
+  DeoptCall->setCallingConv(CI->getCallingConv());
   DeoptBlockTerm->eraseFromParent();
 }
 
@@ -89,6 +90,7 @@ bool LowerGuardIntrinsic::runOnFunction(Function &F) {
 
   auto *DeoptIntrinsic = Intrinsic::getDeclaration(
       F.getParent(), Intrinsic::experimental_deoptimize, {F.getReturnType()});
+  DeoptIntrinsic->setCallingConv(GuardDecl->getCallingConv());
 
   for (auto *CI : ToLower) {
     MakeGuardControlFlowExplicit(DeoptIntrinsic, CI);
diff --git a/llvm/test/Transforms/LowerGuardIntrinsic/with-calling-conv.ll b/llvm/test/Transforms/LowerGuardIntrinsic/with-calling-conv.ll
new file mode 100644
index 00000000000..9dce54ce604
--- /dev/null
+++ b/llvm/test/Transforms/LowerGuardIntrinsic/with-calling-conv.ll
@@ -0,0 +1,15 @@
+; RUN: opt -S -lower-guard-intrinsic < %s | FileCheck %s
+
+declare cc99 void @llvm.experimental.guard(i1, ...)
+
+define i8 @f_basic(i1* %c_ptr) {
+; CHECK-LABEL: @f_basic(
+; CHECK:  br i1 %c, label %guarded, label %deopt
+; CHECK: deopt:
+; CHECK-NEXT:  %deoptcall = call cc99 i8 (...) @llvm.experimental.deoptimize.i8() [ "deopt"() ]
+; CHECK-NEXT:  ret i8 %deoptcall
+
+  %c = load volatile i1, i1* %c_ptr
+  call cc99 void(i1, ...) @llvm.experimental.guard(i1 %c) [ "deopt"() ]
+  ret i8 6
+}