Propagate vfs overlays and -fbuiltin-headers-in-system-modules

This fixes explicit module builds for a hello world program on Windows
as well as the ucrt import build failure as in the included test.

Author: hjyamauchi

lib/ClangImporter/ClangImporter.cpp

@@ -957,6 +957,11 @@ importer::addCommonInvocationArguments(
       }
     }
   }
+
+  for (auto &overlay : searchPathOpts.VFSOverlayFiles) {
+    invocationArgStrs.push_back("-ivfsoverlay");
+    invocationArgStrs.push_back(overlay);
+  }
 }
 
 bool ClangImporter::canReadPCH(StringRef PCHFilename) {

lib/ClangImporter/ClangModuleDependencyScanner.cpp

@@ -138,7 +138,7 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
     clang::tooling::dependencies::DependencyScanningTool &clangScanningTool,
     clang::tooling::dependencies::ModuleDepsGraph &clangDependencies,
     StringRef moduleOutputPath, RemapPathCallback callback) {
-  const auto &ctx = Impl.SwiftContext;
+  auto &ctx = Impl.SwiftContext;
   ModuleDependencyVector result;
 
   auto remapPath = [&](StringRef path) {
@@ -201,6 +201,11 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
         clangModuleDep.getBuildArguments(),
         [&](const std::string &Arg) { clangArgs.push_back(Arg.c_str()); });
 
+    ClangInvocationFileMapping fileMapping =
+        getClangInvocationFileMapping(ctx, nullptr, /*supressDiagnostic*/true);
+    if (fileMapping.requiresBuiltinHeadersInSystemModules)
+      clangArgs.push_back("-fbuiltin-headers-in-system-modules");
+
     bool success = clang::CompilerInvocation::CreateFromArgs(
         depsInvocation, clangArgs, clangDiags);
     (void)success;

test/ScanDependencies/win-crt.swift

@@ -0,0 +1,11 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -scan-dependencies -Xcc -v %s -o - | %validate-json | %FileCheck %s
+
+// We want to explicitly import WinSDK's CRT.
+// REQUIRES: OS=windows-msvc
+
+import CRT
+
+// CHECK:        "modulePath": "{{.*}}\\ucrt-{{.*}}.pcm",
+// CHECK-NEXT:   "sourceFiles": [
+// CHECK-NEXT:      "{{.*}}\\ucrt\\module.modulemap"