Merge pull request swiftlang#24877 from benlangmuir/cant-validate-slow-if-we-dont-validate

benlangmuir · web-flow · commit aa9f041b4b8b · 2019-05-20T08:21:59.000-07:00
[clang-importer] Fix option -disable-modules-validate-system-headers
diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
@@ -636,7 +636,9 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
     invocationArgStrs.back().append(moduleCachePath);
   }
 
-  if (!importerOpts.DisableModulesValidateSystemHeaders) {
+  if (importerOpts.DisableModulesValidateSystemHeaders) {
+    invocationArgStrs.push_back("-fno-modules-validate-system-headers");
+  } else {
     invocationArgStrs.push_back("-fmodules-validate-system-headers");
   }
 
diff --git a/test/ClangImporter/disable-modules-validate-system-headers.swift b/test/ClangImporter/disable-modules-validate-system-headers.swift
@@ -0,0 +1,7 @@
+// RUN: %target-swift-frontend %s -parse -dump-clang-diagnostics 2>&1 | %FileCheck %s -check-prefix=DEFAULT
+// DEFAULT: -fmodules-validate-system-headers
+// DEFAULT-NOT: -fno-modules-validate-system-headers
+
+// RUN: %target-swift-frontend %s -parse -dump-clang-diagnostics -disable-modules-validate-system-headers 2>&1 | %FileCheck %s -check-prefix=DISABLE
+// DISABLE: -fno-modules-validate-system-headers
+// DISABLE-NOT: -fmodules-validate-system-headers

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,9 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,`
`636`	`636`	`invocationArgStrs.back().append(moduleCachePath);`
`637`	`637`	`}`
`638`	`638`
`639`		`- if (!importerOpts.DisableModulesValidateSystemHeaders) {`
	`639`	`+ if (importerOpts.DisableModulesValidateSystemHeaders) {`
	`640`	`+ invocationArgStrs.push_back("-fno-modules-validate-system-headers");`
	`641`	`+ } else {`
`640`	`642`	`invocationArgStrs.push_back("-fmodules-validate-system-headers");`
`641`	`643`	`}`
`642`	`644`