Merge pull request #5316 from mxswd/disable-modules-validate-system-headers

Added new frontend flag to accelerate clang importer

Author: jrose-apple

include/swift/ClangImporter/ClangImporterOptions.h

@@ -70,6 +70,10 @@ class ClangImporterOptions {
 
   /// If true ignore the swift bridged attribute.
   bool DisableSwiftBridgeAttr = false;
+
+  /// When set, don't validate module system headers. If a header is modified
+  /// and this is not set, clang will rebuild the module.
+  bool DisableModulesValidateSystemHeaders = false;
 };
 
 } // end namespace swift

include/swift/Option/FrontendOptions.td

@@ -227,6 +227,9 @@ def disable_sil_linking : Flag<["-"], "disable-sil-linking">,
 def dump_clang_diagnostics : Flag<["-"], "dump-clang-diagnostics">,
   HelpText<"Dump Clang diagnostics to stderr">;
 
+def disable_modules_validate_system_headers : Flag<["-"], "disable-modules-validate-system-headers">,
+  HelpText<"Disable validating system headers in the Clang importer">;
+
 def emit_verbose_sil : Flag<["-"], "emit-verbose-sil">,
   HelpText<"Emit locations during SIL emission">;
 

lib/ClangImporter/ClangImporter.cpp

@@ -326,7 +326,6 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
 
           // Enable modules
           "-fmodules",
-          "-fmodules-validate-system-headers",
           "-Werror=non-modular-include-in-framework-module",
           // Enable implicit module maps (implied by "-fmodules")
           "-fimplicit-module-maps",
@@ -484,6 +483,10 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
     invocationArgStrs.back().append(moduleCachePath);
   }
 
+  if (!importerOpts.DisableModulesValidateSystemHeaders) {
+    invocationArgStrs.push_back("-fmodules-validate-system-headers");
+  }
+
   if (importerOpts.DetailedPreprocessingRecord) {
     invocationArgStrs.insert(invocationArgStrs.end(), {
       "-Xclang", "-detailed-preprocessing-record",

lib/Frontend/CompilerInvocation.cpp

@@ -965,6 +965,8 @@ static bool ParseClangImporterArgs(ClangImporterOptions &Opts,
 
   Opts.DisableSwiftBridgeAttr |= Args.hasArg(OPT_disable_swift_bridge_attr);
 
+  Opts.DisableModulesValidateSystemHeaders |= Args.hasArg(OPT_disable_modules_validate_system_headers);
+
   return false;
 }