Merge pull request #3004 from varungandhi-apple/vg-apple/stable

varungandhi-apple · web-flow · commit 24b229214cdf · 2021-05-26T12:49:43.000-07:00
Use additional musttail checking only in debug builds.
diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
@@ -3323,6 +3323,7 @@ cl::init(false), cl::desc("Check that tail calls from swifttailcc functions to"
 
 void Verifier::verifyMustTailCall(CallInst &CI) {
   if (!CI.isMustTailCall()) {
+#ifndef NDEBUG
     if (EnableSwiftTailCCMustTailCheck &&
         CI.getCallingConv() == CallingConv::SwiftTail &&
         CI.getCaller()->getCallingConv() == CallingConv::SwiftTail &&
@@ -3331,6 +3332,7 @@ void Verifier::verifyMustTailCall(CallInst &CI) {
         false, "tail call from swifttail->swiftail should be marked musttail",
         &CI);
     }
+#endif
     return;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -3323,6 +3323,7 @@ cl::init(false), cl::desc("Check that tail calls from swifttailcc functions to"`
`3323`	`3323`
`3324`	`3324`	`void Verifier::verifyMustTailCall(CallInst &CI) {`
`3325`	`3325`	`if (!CI.isMustTailCall()) {`
	`3326`	`+#ifndef NDEBUG`
`3326`	`3327`	`if (EnableSwiftTailCCMustTailCheck &&`
`3327`	`3328`	`CI.getCallingConv() == CallingConv::SwiftTail &&`
`3328`	`3329`	`CI.getCaller()->getCallingConv() == CallingConv::SwiftTail &&`
`@@ -3331,6 +3332,7 @@ void Verifier::verifyMustTailCall(CallInst &CI) {`
`3331`	`3332`	`false, "tail call from swifttail->swiftail should be marked musttail",`
`3332`	`3333`	`&CI);`
`3333`	`3334`	`}`
	`3335`	`+#endif`
`3334`	`3336`	`return;`
`3335`	`3337`	`}`
`3336`	`3338`