Merge pull request #3016 from etcwilde/swift-next/cherry-pick-swifttailcc-musttail

Cherry-Pick -enable-swifttail-musttail-check flag

Author: etcwilde

llvm/lib/IR/Verifier.cpp

@@ -3453,7 +3453,26 @@ static AttrBuilder getParameterABIAttributes(int I, AttributeList Attrs) {
   return Copy;
 }
 
+static cl::opt<bool>
+EnableSwiftTailCCMustTailCheck("enable-swifttailcc-musttail-check",
+cl::init(false), cl::desc("Check that tail calls from swifttailcc functions to"
+                          " swifttailcc functions are marked musttail."));
+
 void Verifier::verifyMustTailCall(CallInst &CI) {
+  if (!CI.isMustTailCall()) {
+#ifndef NDEBUG
+    if (EnableSwiftTailCCMustTailCheck &&
+        CI.getCallingConv() == CallingConv::SwiftTail &&
+        CI.getCaller()->getCallingConv() == CallingConv::SwiftTail &&
+        isa_and_nonnull<ReturnInst>(CI.getNextNode())) {
+      Assert(
+        false, "tail call from swifttail->swiftail should be marked musttail",
+        &CI);
+    }
+#endif
+    return;
+  }
+
   Assert(!CI.isInlineAsm(), "cannot use musttail call with inline asm", &CI);
 
   Function *F = CI.getParent()->getParent();
@@ -3538,9 +3557,7 @@ void Verifier::verifyMustTailCall(CallInst &CI) {
 
 void Verifier::visitCallInst(CallInst &CI) {
   visitCallBase(CI);
-
-  if (CI.isMustTailCall())
-    verifyMustTailCall(CI);
+  verifyMustTailCall(CI);
 }
 
 void Verifier::visitInvokeInst(InvokeInst &II) {

llvm/lib/Transforms/IPO/MergeFunctions.cpp

@@ -709,7 +709,11 @@ void MergeFunctions::writeThunk(Function *F, Function *G) {
 
   CallInst *CI = Builder.CreateCall(F, Args);
   ReturnInst *RI = nullptr;
-  CI->setTailCall();
+  bool isSwiftTailCall =
+   F->getCallingConv() == CallingConv::SwiftTail &&
+   G->getCallingConv() == CallingConv::SwiftTail;
+  CI->setTailCallKind(
+    isSwiftTailCall ? llvm::CallInst::TCK_MustTail : llvm::CallInst::TCK_Tail);
   CI->setCallingConv(F->getCallingConv());
   CI->setAttributes(F->getAttributes());
   if (H->getReturnType()->isVoidTy()) {