[clangd] Fix 407ac2e, which was broken and committed too soon
authorSam McCall <sam.mccall@gmail.com>
Fri, 29 Nov 2019 11:05:00 +0000 (12:05 +0100)
committerSam McCall <sam.mccall@gmail.com>
Fri, 29 Nov 2019 11:05:12 +0000 (12:05 +0100)
clang-tools-extra/clangd/TUScheduler.cpp

index b51221d..884c82d 100644 (file)
@@ -408,11 +408,11 @@ void ASTWorker::update(ParseInputs Inputs, WantDiagnostics WantDiags) {
     // Rebuild the preamble and the AST.
     StoreDiags CompilerInvocationDiagConsumer;
     std::vector<std::string> CC1Args;
-    std::unique_ptr<CompilerInvocation> Invocation =
-        buildCompilerInvocation(Inputs, CompilerInvocationDiagConsumer);
+    std::unique_ptr<CompilerInvocation> Invocation = buildCompilerInvocation(
+        Inputs, CompilerInvocationDiagConsumer, &CC1Args);
     // Log cc1 args even (especially!) if creating invocation failed.
     if (!CC1Args.empty())
-      vlog("cc1 args: {0}", llvm::join(CC1Args, " "));
+      vlog("Driver produced command: cc1 {0}", llvm::join(CC1Args, " "));
     std::vector<Diag> CompilerInvocationDiags =
         CompilerInvocationDiagConsumer.take();
     if (!Invocation) {