Merge pull request #40962 from rintaro/sourcekit-compile-rdar86809003

[SourceKit] Ignore LLVM arguments in 'compile' request

Author: rintaro

lib/IDE/CompileInstance.cpp

@@ -263,6 +263,11 @@ bool CompileInstance::setupCI(
     return false;
   }
 
+  // Since LLVM arguments are parsed into a global state, LLVM can't handle
+  // multiple argument sets in a process simultaneously. So let's ignore them.
+  // FIXME: Remove this if possible.
+  invocation.getFrontendOptions().LLVMArgs.clear();
+
   /// Declare the frontend to be used for multiple compilations.
   invocation.getFrontendOptions().ReuseFrontendForMutipleCompilations = true;
 
@@ -289,7 +294,7 @@ void CompileInstance::performSema(
   if (CI && ArgsHash == CachedArgHash &&
       CachedReuseCount < Opts.MaxASTReuseCount) {
     CI->getASTContext().CancellationFlag = CancellationFlag;
-    if (performCachedSemaIfPossible(DiagC)) {
+    if (!performCachedSemaIfPossible(DiagC)) {
       // If we compileted cacehd Sema operation. We're done.
       ++CachedReuseCount;
       return;
@@ -307,6 +312,9 @@ void CompileInstance::performSema(
     return;
   }
 
+  CI->addDiagnosticConsumer(DiagC);
+  SWIFT_DEFER { CI->removeDiagnosticConsumer(DiagC); };
+
   // CI is potentially reusable.
   CachedArgHash = ArgsHash;
 

test/SourceKit/Compile/basic.swift

@@ -1,5 +1,3 @@
-// REQUIRES: rdar86809003
-
 // RUN: %empty-directory(%t)
 // RUN: %empty-directory(%t/out)
 // RUN: split-file %s %t