Merge pull request swiftlang#34640 from DougGregor/no-implicit-concurrency-module-build

swift-ci · web-flow · commit 963b4e6c2afd · 2020-11-09T13:33:24.000-08:00
diff --git a/lib/Frontend/Frontend.cpp b/lib/Frontend/Frontend.cpp
@@ -709,7 +709,9 @@ CompilerInstance::openModuleDoc(const InputFile &input) {
 
 bool CompilerInvocation::shouldImportSwiftConcurrency() const {
   return getLangOptions().EnableExperimentalConcurrency
-      && !getLangOptions().DisableImplicitConcurrencyModuleImport;
+      && !getLangOptions().DisableImplicitConcurrencyModuleImport &&
+      getFrontendOptions().InputMode !=
+        FrontendOptions::ParseInputMode::SwiftModuleInterface;
 }
 
 /// Implicitly import the SwiftOnoneSupport module in non-optimized

Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,9 @@ CompilerInstance::openModuleDoc(const InputFile &input) {`
`709`	`709`
`710`	`710`	`bool CompilerInvocation::shouldImportSwiftConcurrency() const {`
`711`	`711`	`return getLangOptions().EnableExperimentalConcurrency`
`712`		`- && !getLangOptions().DisableImplicitConcurrencyModuleImport;`
	`712`	`+ && !getLangOptions().DisableImplicitConcurrencyModuleImport &&`
	`713`	`+ getFrontendOptions().InputMode !=`
	`714`	`+ FrontendOptions::ParseInputMode::SwiftModuleInterface;`
`713`	`715`	`}`
`714`	`716`
`715`	`717`	`/// Implicitly import the SwiftOnoneSupport module in non-optimized`