Address code review: adding a test for -experimental-clang-importer-direct-cc1-scan and renaming a function.

Author: qiongsiwu

include/swift/Frontend/ModuleInterfaceLoader.h

@@ -638,7 +638,7 @@ struct ResultTy {
 
 using ArgListTy = std::vector<std::string>;
 
-void getOutputPath(ResultTy &outputPath, const StringRef &moduleName,
+void setOutputPath(ResultTy &outputPath, const StringRef &moduleName,
                    const StringRef &interfacePath, const StringRef &sdkPath,
                    const CompilerInvocation &CI, const ArgListTy &extraArgs);
 } // namespace SwiftInterfaceModuleOutputPathResolution

lib/DependencyScan/ScanDependencies.cpp

@@ -422,14 +422,13 @@ class ExplicitModuleDependencyResolver {
     const auto &CI = instance.getInvocation();
 
     SwiftInterfaceModuleOutputPathResolution::ArgListTy extraArgsList;
-    const SwiftInterfaceModuleOutputPathResolution::ArgListTy
-        &clangImpporterOptions =
-            CI.getClangImporterOptions()
-                .getReducedExtraArgsForSwiftModuleDependency();
+    const auto &clangImporterOptions =
+        CI.getClangImporterOptions()
+            .getReducedExtraArgsForSwiftModuleDependency();
 
     skip = 0;
-    for (auto it = clangImpporterOptions.begin(),
-              end = clangImpporterOptions.end();
+    for (auto it = clangImporterOptions.begin(),
+              end = clangImporterOptions.end();
          it != end; it++) {
       if (skip) {
         skip = 0;
@@ -449,7 +448,7 @@ class ExplicitModuleDependencyResolver {
     auto swiftTextualDeps = resolvingDepInfo.getAsSwiftInterfaceModule();
     auto &interfacePath = swiftTextualDeps->swiftInterfaceFile;
     auto sdkPath = instance.getASTContext().SearchPathOpts.getSDKPath();
-    SwiftInterfaceModuleOutputPathResolution::getOutputPath(
+    SwiftInterfaceModuleOutputPathResolution::setOutputPath(
         outputPath, moduleID.ModuleName, interfacePath, sdkPath, CI,
         extraArgsList);
 

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -2010,7 +2010,7 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
 void InterfaceSubContextDelegateImpl::getCachedOutputPath(
     SwiftInterfaceModuleOutputPathResolution::ResultTy &resolvedOutputPath,
     StringRef moduleName, StringRef interfacePath, StringRef sdkPath) {
-  SwiftInterfaceModuleOutputPathResolution::getOutputPath(
+  SwiftInterfaceModuleOutputPathResolution::setOutputPath(
       resolvedOutputPath, moduleName, interfacePath, sdkPath,
       genericSubInvocation,
       genericSubInvocation.getClangImporterOptions()
@@ -2831,7 +2831,7 @@ static std::string getContextHash(const CompilerInvocation &CI,
   return llvm::toString(llvm::APInt(64, H), 36, /*Signed=*/false);
 }
 
-void getOutputPath(ResultTy &resolvedOutputPath, const StringRef &moduleName,
+void setOutputPath(ResultTy &resolvedOutputPath, const StringRef &moduleName,
                    const StringRef &interfacePath, const StringRef &sdkPath,
                    const CompilerInvocation &CI, const ArgListTy &extraArgs) {
   auto &outputPath = resolvedOutputPath.outputPath;

test/ScanDependencies/eliminate_unused_vfs.swift

@@ -6,14 +6,17 @@
 
 // RUN: sed -e "s|OUT_DIR|%t/redirects|g"  -e "s|IN_DIR|%S/Inputs/CHeaders|g" %t/overlay_template.yaml > %t/overlay.yaml
 // RUN: sed -e "s|OUT_DIR|%t/redirects|g"  -e "s|IN_DIR|%S/Inputs/CHeaders1|g" %t/overlay_template.yaml > %t/overlay1.yaml
+// RUN: sed -e "s|OUT_DIR|%t/redirects|g"  -e "s|IN_DIR|%S/Inputs/CHeaders2|g" %t/overlay_template.yaml > %t/overlay2.yaml
 
 // RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-interface -module-cache-path %t/module-cache %t/test.swift -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -file-compilation-dir %t -Xcc -ivfsoverlay -Xcc %t/overlay.yaml
 // RUN: %validate-json %t/deps.json > %t/validated_deps.json
 // RUN: cat %t/validated_deps.json | %FileCheck %s
 
 // RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-interface -module-cache-path %t/module-cache %t/test.swift -o %t/deps1.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -file-compilation-dir %t -Xcc -ivfsoverlay -Xcc %t/overlay1.yaml
 // RUN: %validate-json %t/deps1.json > %t/validated_deps1.json
-// RUN: cat %t/validated_deps.json %t/validated_deps1.json \
+// RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-interface -module-cache-path %t/module-cache %t/test.swift -o %t/deps2.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -experimental-clang-importer-direct-cc1-scan -file-compilation-dir %t -Xcc -ivfsoverlay -Xcc %t/overlay2.yaml
+// RUN: %validate-json %t/deps2.json > %t/validated_deps2.json
+// RUN: cat %t/validated_deps.json %t/validated_deps1.json %t/validated_deps2.json \
 // RUN:   | %FileCheck %s --check-prefix=MOD-HASH
 
 //--- overlay_template.yaml
@@ -92,3 +95,14 @@ import F
 // MOD-HASH:     "-swift-module-file=Swift={{.*}}{{/|\\}}Swift-[[SHASH]].swiftmodule",
 // MOD-HASH:     "-swift-module-file=SwiftOnoneSupport={{.*}}{{/|\\}}SwiftOnoneSupport-[[SOSHASH]].swiftmodule",
 // MOD-HASH:     ],
+// MOD-HASH: "mainModuleName": "deps2",
+// MOD-HASH: "linkLibraries": [],
+// MOD-HASH: "details": {
+// MOD-HASH-NEXT:   "swift": {
+// MOD-HASH-NEXT:   "moduleInterfacePath": "{{.*}}{{/|\\}}F.swiftinterface",
+// MOD-HASH:   "commandLine": [
+// MOD-HASH:     "-o",
+// MOD-HASH-NEXT:     "{{.*}}{{/|\\}}F-[[FHASH]].swiftmodule",
+// MOD-HASH:     "-swift-module-file=Swift={{.*}}{{/|\\}}Swift-[[SHASH]].swiftmodule",
+// MOD-HASH:     "-swift-module-file=SwiftOnoneSupport={{.*}}{{/|\\}}SwiftOnoneSupport-[[SOSHASH]].swiftmodule",
+// MOD-HASH:     ],