[importer] Adjust for new dependency scanner API

Author: jansvoboda11

lib/ClangImporter/ClangModuleDependencyScanner.cpp

@@ -23,11 +23,30 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Signals.h"
 
+// TODO: Move back into Clang header.
+#include "llvm/CAS/CachingOnDiskFileSystem.h"
+
 using namespace swift;
 
 using namespace clang::tooling;
 using namespace clang::tooling::dependencies;
 
+static std::string lookupModuleOutput(const ModuleID &MID,
+                                      ModuleOutputKind MOK) {
+  // Deciding the output paths is done in swift-driver.
+  switch (MOK) {
+  case ModuleOutputKind::ModuleFile:
+    return "<replace-me>";
+  case ModuleOutputKind::DependencyFile:
+    return "<replace-me>";
+  case ModuleOutputKind::DependencyTargets:
+    return MID.ModuleName + "-" + MID.ContextHash;
+  case ModuleOutputKind::DiagnosticSerializationFile:
+    return "<replace-me>";
+  }
+  llvm_unreachable("Fully covered switch above!");
+}
+
 // Add search paths.
 // Note: This is handled differently for the Clang importer itself, which
 // adds search paths to Clang's data structures rather than to its
@@ -119,13 +138,6 @@ void ClangImporter::recordModuleDependencies(
     for (const auto &fileDep : clangModuleDep.FileDeps) {
       fileDeps.push_back(fileDep.getKey().str());
     }
-    // Inherit all Clang driver args when creating the clang importer.
-    ArrayRef<std::string> allArgs = Impl.ClangArgs;
-    ClangImporterOptions Opts;
-
-    // Ensure the arguments we collected is sufficient to create a Clang
-    // invocation.
-    assert(createClangInvocation(this, Opts, nullptr, allArgs));
 
     std::vector<std::string> swiftArgs;
     // We are using Swift frontend mode.
@@ -142,22 +154,13 @@ void ClangImporter::recordModuleDependencies(
       addClangArg(arg);
     };
 
-    // Add all args inherited from creating the importer.
-    auto It = allArgs.begin();
-
-    {
-      StringRef arg = *It;
-      if (arg == "clang" ||
-          arg.endswith(llvm::sys::path::get_separator().str() + "clang")) {
-        // Remove the initial path to clang executable argument, to avoid
-        // treating it as an executable input to compilation. It is not needed
-        // because the consumer of this command-line will invoke the emit-PCM
-        // action via swift-frontend.
-        It += 1;
-      }
-    }
+    // Add args reported by the scanner.
+    auto It = clangModuleDep.BuildArguments.begin();
+    auto ItEnd = clangModuleDep.BuildArguments.end();
+    // Skip -cc1.
+    ++It;
 
-    while(It != allArgs.end()) {
+    while(It != ItEnd) {
       StringRef arg = *It;
       // Remove the -target arguments because we should use the target triple
       // specified with `-clang-target` on the scanner invocation, or
@@ -169,22 +172,11 @@ void ClangImporter::recordModuleDependencies(
         // specified in the interface file.
         It += 1;
       } else {
-        addClangArg(*It);
+        addClangFrontendArg(*It);
         ++ It;
       }
     }
 
-    // Add the equivalent of the old `getAdditionalArgsWithoutModulePaths`.
-    // TODO: Should we be passing all cc1 args (ie.
-    // `getCanonicalCommandLineWithoutModulePaths`)?
-    addClangFrontendArg("-fno-implicit-modules");
-    addClangFrontendArg("-emit-module");
-    addClangFrontendArg(Twine("-fmodule-name=") + clangModuleDep.ID.ModuleName);
-    if (clangModuleDep.IsSystem)
-      addClangFrontendArg("-fsystem-module");
-    if (clangModuleDep.BuildInvocation.getLangOpts()->NeededByPCHOrCompilationUsesPCH)
-      addClangFrontendArg("-fmodule-related-to-pch");
-
     // If the scanner is invoked with '-clang-target', ensure this is the target
     // used to build this PCM.
     if (Impl.SwiftContext.LangOpts.ClangTarget.hasValue()) {
@@ -267,7 +259,7 @@ Optional<ModuleDependencies> ClangImporter::getModuleDependencies(
 
   auto clangDependencies = cache.getClangScannerTool().getFullDependencies(
       commandLineArgs, workingDir, cache.getAlreadySeenClangModules(),
-      moduleName);
+      lookupModuleOutput, moduleName);
   if (!clangDependencies) {
     auto errorStr = toString(clangDependencies.takeError());
     // We ignore the "module 'foo' not found" error, the Swift dependency
@@ -322,7 +314,8 @@ bool ClangImporter::addBridgingHeaderDependencies(
       ctx.SourceMgr.getFileSystem()->getCurrentWorkingDirectory().get();
 
   auto clangDependencies = cache.getClangScannerTool().getFullDependencies(
-      commandLineArgs, workingDir, cache.getAlreadySeenClangModules());
+      commandLineArgs, workingDir, cache.getAlreadySeenClangModules(),
+      lookupModuleOutput);
   if (!clangDependencies) {
     // FIXME: Route this to a normal diagnostic.
     llvm::logAllUnhandledErrors(clangDependencies.takeError(), llvm::errs());

test/ScanDependencies/module_deps_cache_reuse.swift

@@ -114,8 +114,6 @@ import SubE
 // CHECK-NEXT: "-frontend"
 // CHECK-NEXT: "-only-use-extra-clang-opts
 // CHECK-NOT: "BUILD_DIR/bin/clang"
-// CHECK: "-Xcc"
-// CHECK-NEXT: "-fsyntax-only",
 // CHECK: "-fsystem-module",
 // CHECK: "-emit-pcm",
 // CHECK: "-module-name",