diff options
| -rw-r--r-- | llvm/lib/Transforms/Utils/InlineFunction.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Transforms/Inline/deoptimize-intrinsic.ll | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Utils/InlineFunction.cpp b/llvm/lib/Transforms/Utils/InlineFunction.cpp index 646afd8cd61..0c4ffd93dbf 100644 --- a/llvm/lib/Transforms/Utils/InlineFunction.cpp +++ b/llvm/lib/Transforms/Utils/InlineFunction.cpp @@ -1843,6 +1843,7 @@ bool llvm::InlineFunction(CallSite CS, InlineFunctionInfo &IFI, continue; } + auto CallingConv = DeoptCall->getCallingConv(); auto *CurBB = RI->getParent(); RI->eraseFromParent(); @@ -1856,8 +1857,9 @@ bool llvm::InlineFunction(CallSite CS, InlineFunctionInfo &IFI, "Expected at least the deopt operand bundle"); IRBuilder<> Builder(CurBB); - Value *NewDeoptCall = + CallInst *NewDeoptCall = Builder.CreateCall(NewDeoptIntrinsic, CallArgs, OpBundles); + NewDeoptCall->setCallingConv(CallingConv); if (NewDeoptCall->getType()->isVoidTy()) Builder.CreateRetVoid(); else diff --git a/llvm/test/Transforms/Inline/deoptimize-intrinsic.ll b/llvm/test/Transforms/Inline/deoptimize-intrinsic.ll index 800ace49e15..98fbc68488e 100644 --- a/llvm/test/Transforms/Inline/deoptimize-intrinsic.ll +++ b/llvm/test/Transforms/Inline/deoptimize-intrinsic.ll @@ -1,6 +1,7 @@ ; RUN: opt -S -always-inline < %s | FileCheck %s declare i8 @llvm.experimental.deoptimize.i8(...) +declare cc42 i32 @llvm.experimental.deoptimize.i32(...) define i8 @callee(i1* %c) alwaysinline { %c0 = load volatile i1, i1* %c @@ -120,3 +121,17 @@ define void @caller_with_stacksaverestore(i32 %n) { call i8 @callee_with_dynamic_alloca(i32 %n) ret void } + +define i32 @callee_with_coldcc() alwaysinline { + %v0 = call cc42 i32(...) @llvm.experimental.deoptimize.i32(i32 1) [ "deopt"() ] + ret i32 %v0 +} + +define void @caller_with_coldcc() { +; CHECK-LABEL: @caller_with_coldcc( +; CHECK-NEXT: call cc42 void (...) @llvm.experimental.deoptimize.isVoid(i32 1) [ "deopt"() ] +; CHECK-NEXT: ret void + + %val = call i32 @callee_with_coldcc() + ret void +} |
