[clang-tools-extra] 4f00082 - [clangd] Fix 407ac2e, which was broken and committed too soon

[Sam McCall via cfe-commits]

Author: Sam McCall
Date: 2019-11-29T12:05:12+01:00
New Revision: 4f000824222f97c0cfd5b19951a1068132e57e79

URL: https://github.com/llvm/llvm-project/commit/4f000824222f97c0cfd5b19951a1068132e57e79
DIFF: https://github.com/llvm/llvm-project/commit/4f000824222f97c0cfd5b19951a1068132e57e79.diff

LOG: [clangd] Fix 407ac2e, which was broken and committed too soon

Added: 
    

Modified: 
    clang-tools-extra/clangd/TUScheduler.cpp

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/TUScheduler.cpp b/clang-tools-extra/clangd/TUScheduler.cpp
index b51221d7d903..884c82d5b190 100644
--- a/clang-tools-extra/clangd/TUScheduler.cpp
+++ b/clang-tools-extra/clangd/TUScheduler.cpp
@@ -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) {