?

Author: K-ballo

src/test/TestRunner.cpp

@@ -32,6 +32,103 @@
 
 namespace clang::mrdocs {
 
+namespace {
+
+std::optional<std::string> 
+getCompilerVerboseOutput(llvm::StringRef compilerPath) 
+{
+    if ( ! llvm::sys::fs::exists(compilerPath))
+    {
+        return std::nullopt;
+    }
+
+    llvm::SmallString<128> outputPath;
+    if (auto ec = llvm::sys::fs::createTemporaryFile("compiler-info", "txt", outputPath)) 
+    {
+        return std::nullopt;
+    }
+
+    std::optional<llvm::StringRef> const redirects[] = {llvm::StringRef(), llvm::StringRef(), outputPath.str()};
+    std::vector<llvm::StringRef> const args = {compilerPath, "-v", "-E", "-x", "c++", "-"};
+    llvm::ArrayRef<llvm::StringRef> emptyEnv;
+    int const result = ExecuteAndWaitWithLogging(compilerPath, args, emptyEnv, redirects);
+    if (result != 0) 
+    {
+        llvm::sys::fs::remove(outputPath);
+        return std::nullopt;
+    }
+
+    auto bufferOrError = llvm::MemoryBuffer::getFile(outputPath);
+    llvm::sys::fs::remove(outputPath);
+    if (!bufferOrError)
+    {
+        return std::nullopt;
+    }
+
+    return bufferOrError.get()->getBuffer().str();
+}
+
+std::vector<std::string> 
+parseIncludePaths(std::string const& compilerOutput) 
+{
+    std::vector<std::string> includePaths;
+    std::istringstream stream(compilerOutput);
+    std::string line;
+    bool capture = false;
+
+    while (std::getline(stream, line)) 
+    {
+        if (line.find("#include <...> search starts here:") != std::string::npos) 
+        {
+            capture = true;
+            continue;
+        }
+        if (line.find("End of search list.") != std::string::npos) 
+        {
+            break;
+        }
+        if (capture) 
+        {
+            line.erase(0, line.find_first_not_of(" "));
+            includePaths.push_back(line);
+        }
+    }
+
+    return includePaths;
+}
+
+std::unordered_map<std::string, std::vector<std::string>> 
+getCompilersDefaultIncludeDir(clang::tooling::CompilationDatabase const& compDb) 
+{
+    std::unordered_map<std::string, std::vector<std::string>> res;
+    auto const allCommands = compDb.getAllCompileCommands();
+
+    for (auto const& cmd : allCommands)
+    {
+        if (!cmd.CommandLine.empty())
+        {
+            auto const& compilerPath = cmd.CommandLine[0];
+            if (res.contains(compilerPath))
+            {
+                continue;
+            }
+
+            std::vector<std::string> includePaths;
+            auto const compilerOutput = getCompilerVerboseOutput(compilerPath);
+            if (!compilerOutput)
+            {
+                res.emplace(compilerPath, includePaths);
+                continue;
+            }
+            includePaths = parseIncludePaths(*compilerOutput);
+            res.emplace(compilerPath, std::move(includePaths));
+        }
+    }
+
+    return res;
+}
+}
+
 TestRunner::
 TestRunner(std::string_view generator)
     : diffCmdPath_(llvm::sys::findProgramByName("diff"))
@@ -114,9 +211,11 @@ handleFile(
 
     // Create an adjusted MrDocsDatabase
     auto parentDir = files::getParentDir(filePath);
-    std::unordered_map<std::string, std::vector<std::string>> defaultIncludePaths;
+    auto compilationDB =  SingleFileDB(filePath);
+    auto const defaultIncludePaths = getCompilersDefaultIncludeDir(
+            compilationDB);
     MrDocsCompilationDatabase compilations(
-        llvm::StringRef(parentDir), SingleFileDB(filePath), config, defaultIncludePaths);
+        llvm::StringRef(parentDir), compilationDB, config, defaultIncludePaths);
 
     report::debug("Building Corpus", filePath);
     auto corpus = CorpusImpl::build(config, compilations);