[clangd][QueryDriver] Use language from underlying database if possible

[sammccall]

clang-tools-extra/clangd/QueryDriverDatabase.cpp

121

does gcc accept the same set of -x flags?

[kadircet]

clang-tools-extra/clangd/QueryDriverDatabase.cpp

121

It seems to be the case. Relevant section of manpage for gcc:

You can specify the input language explicitly with the -x option:

-x language
    Specify explicitly the language for the following input files
    (rather than letting the compiler choose a default based on the
    file name suffix).  This option applies to all following input
    files until the next -x option.  Possible values for language
    are:

            c  c-header  cpp-output
            c++  c++-header  c++-cpp-output
            objective-c  objective-c-header  objective-c-cpp-output
            objective-c++ objective-c++-header objective-c++-cpp-output
            assembler  assembler-with-cpp
            ada
            d
            f77  f77-cpp-input f95  f95-cpp-input
            go
            brig

clang-tools-extra/clangd/QueryDriverDatabase.cpp

std::vector<std::string> parseDriverOutput(llvm::StringRef Output) {
   for (llvm::StringRef Line : llvm::make_range(StartIt, EndIt)) {
     SystemIncludes.push_back(Line.trim().str());
     vlog("System include extraction: adding {0}", Line);
   }
   return SystemIncludes;
 }
 
 std::vector<std::string> extractSystemIncludes(PathRef Driver,
-                                               llvm::StringRef Ext,
+                                               llvm::StringRef Lang,
                                                llvm::Regex &QueryDriverRegex) {
   trace::Span Tracer("Extract system includes");
   SPAN_ATTACH(Tracer, "driver", Driver);
-  SPAN_ATTACH(Tracer, "ext", Ext);
+  SPAN_ATTACH(Tracer, "lang", Lang);
 
   if (!QueryDriverRegex.match(Driver)) {
     vlog("System include extraction: not whitelisted driver {0}", Driver);
     return {};
   }
 
   if (!llvm::sys::fs::exists(Driver)) {
     elog("System include extraction: {0} does not exist.", Driver);
if (auto EC = llvm::sys::fs::createTemporaryFile("system-includes", "clangd",
     return {};
   }
   auto CleanUp = llvm::make_scope_exit(
       [&StdErrPath]() { llvm::sys::fs::remove(StdErrPath); });
 
   llvm::Optional<llvm::StringRef> Redirects[] = {
       {""}, {""}, llvm::StringRef(StdErrPath)};
 
-  auto Type = driver::types::lookupTypeForExtension(Ext);
-  if (Type == driver::types::TY_INVALID) {
-    elog("System include extraction: invalid file type for {0}", Ext);
-    return {};
-  }
   // Should we also preserve flags like "-sysroot", "-nostdinc" ?
-  const llvm::StringRef Args[] = {
-      Driver, "-E", "-x", driver::types::getTypeName(Type), "-", "-v"};
+  const llvm::StringRef Args[] = {Driver, "-E", "-x", Lang, "-", "-v"};
 
   if (int RC = llvm::sys::ExecuteAndWait(Driver, Args, /*Env=*/llvm::None,
                                          Redirects)) {
     elog("System include extraction: driver execution failed with return code: "
          "{0}",
          llvm::to_string(RC));
     return {};
   }
public:
   }
 
   llvm::Optional<tooling::CompileCommand>
   getCompileCommand(PathRef File, ProjectInfo *PI = nullptr) const override {
     auto Cmd = Base->getCompileCommand(File, PI);
     if (!Cmd || Cmd->CommandLine.empty())
       return Cmd;
 
+    llvm::StringRef Lang;
+    for (size_t I = 0, E = Cmd->CommandLine.size(); I < E; ++I) {
+      llvm::StringRef Arg = Cmd->CommandLine[I];
+      if (Arg == "-x" && I + 1 < E)
+        Lang = Cmd->CommandLine[I + 1];
+      else if (Arg.startswith("-x"))
+        Lang = Arg.drop_front(2).trim();
+    }
+    if (Lang.empty()) {
+      llvm::StringRef Ext = llvm::sys::path::extension(File).trim('.');
+      auto Type = driver::types::lookupTypeForExtension(Ext);
+      if (Type == driver::types::TY_INVALID) {
+        elog("System include extraction: invalid file type for {0}", Ext);
+        return {};
+      }
+      Lang = driver::types::getTypeName(Type);
+    }
+
     llvm::SmallString<128> Driver(Cmd->CommandLine.front());
     llvm::sys::fs::make_absolute(Cmd->Directory, Driver);
-    llvm::StringRef Ext = llvm::sys::path::extension(File).trim('.');
-    auto Key = std::make_pair(Driver.str(), Ext);
+    auto Key = std::make_pair(Driver.str(), Lang);
 
     std::vector<std::string> SystemIncludes;
     {
       std::lock_guard<std::mutex> Lock(Mu);
 
       auto It = DriverToIncludesCache.find(Key);
       if (It != DriverToIncludesCache.end())
         SystemIncludes = It->second;