Skip to content

Commit 5fb006b

Browse files
authored
Merge pull request #84518 from tshortli/revert-really-require-swift-version-in-module-interfaces
Revert "Frontend: Require explicit language mode when emitting swiftinterfaces"
2 parents a721d10 + fba664c commit 5fb006b

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

lib/Frontend/CompilerInvocation.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,8 +1040,10 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
10401040
if (!isValid)
10411041
diagnoseSwiftVersion(vers, A, Args, Diags);
10421042
} else if (FrontendOpts.InputsAndOutputs.hasModuleInterfaceOutputPath()) {
1043-
Diags.diagnose({}, diag::error_module_interface_requires_language_mode);
1044-
HadError = true;
1043+
Diags.diagnose({}, diag::error_module_interface_requires_language_mode)
1044+
.limitBehavior(DiagnosticBehavior::Warning);
1045+
// FIXME: Make this an error again (rdar://145168219)
1046+
// HadError = true;
10451047
}
10461048

10471049
if (auto A = Args.getLastArg(OPT_package_description_version)) {

test/ModuleInterface/language_mode.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// RUN: %empty-directory(%t)
22

3-
// RUN: not %swift_frontend_plain -target %target-swift-5.1-abi-triple %s \
3+
// RUN: %swift_frontend_plain -target %target-swift-5.1-abi-triple %s \
44
// RUN: -enable-library-evolution -module-name Test \
55
// RUN: -emit-module-interface-path %t.swiftinterface \
66
// RUN: -emit-module -o /dev/null 2>&1 | %FileCheck %s
77

8-
// CHECK: <unknown>:0: error: emitting module interface files requires '-language-mode'
8+
// CHECK: <unknown>:0: warning: emitting module interface files requires '-language-mode'
99

1010
// RUN: %swift_frontend_plain -target %target-swift-5.1-abi-triple %s \
1111
// RUN: -enable-library-evolution -module-name Test \

0 commit comments

Comments
 (0)