Skip to content

Commit 9eb4226

Browse files
jrose-applejrose-apple
authored
[ParseableInterface] Turn on -enable-parseable-module-interface always (#23356)
...and remove the option. This is ~technically~ CLI-breaking because Swift 5 shipped this as a hidden driver option, but it wouldn't have /done/ anything in Swift 5, so I think it's okay to remove. Note that if a parseable interface (.swiftinterface) and a binary interface (.swiftmodule) are both present, the binary one will still be preferred. This just /allows/ parseable interfaces to be used. rdar://problem/36885834 (cherry picked from commit 22f9853)
1 parent a36424a commit 9eb4226

33 files changed

+70
-97
lines changed

‎include/swift/Frontend/FrontendOptions.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,6 @@ class FrontendOptions {
220220
/// (if asked to emit SIL).
221221
bool EmitVerboseSIL = false;
222222

223-
/// If set, find and import parseable modules from .swiftinterface files.
224-
bool EnableParseableModuleInterface = false;
225-
226223
/// If set, this module is part of a mixed Objective-C/Swift framework, and
227224
/// the Objective-C half should implicitly be visible to the Swift sources.
228225
bool ImportUnderlyingModule = false;

‎include/swift/Option/Options.td

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,6 @@ def emit_parseable_module_interface_path :
342342
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild,
343343
ArgumentIsPath]>,
344344
MetaVarName<"<path>">, HelpText<"Output parseable interface file to <path>">;
345-
def enable_parseable_module_interface :
346-
Flag<["-"], "enable-parseable-module-interface">,
347-
Flags<[FrontendOption, HelpHidden, NoInteractiveOption,
348-
DoesNotAffectIncrementalBuild]>,
349-
HelpText<"Accept parseable .swiftinterface form of modules">;
350345

351346
def emit_objc_header : Flag<["-"], "emit-objc-header">,
352347
Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild]>,

‎lib/Driver/ToolChains.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ static void addCommonFrontendArgs(const ToolChain &TC, const OutputInfo &OI,
192192
inputArgs.AddLastArg(arguments, options::OPT_import_underlying_module);
193193
inputArgs.AddLastArg(arguments, options::OPT_module_cache_path);
194194
inputArgs.AddLastArg(arguments, options::OPT_module_link_name);
195-
inputArgs.AddLastArg(arguments, options::OPT_enable_parseable_module_interface);
196195
inputArgs.AddLastArg(arguments, options::OPT_nostdimport);
197196
inputArgs.AddLastArg(arguments, options::OPT_parse_stdlib);
198197
inputArgs.AddLastArg(arguments, options::OPT_resource_dir);

‎lib/Frontend/ArgsToFrontendOptionsConverter.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ bool ArgsToFrontendOptionsConverter::convert(
163163

164164
Opts.EnableSourceImport |= Args.hasArg(OPT_enable_source_import);
165165
Opts.ImportUnderlyingModule |= Args.hasArg(OPT_import_underlying_module);
166-
Opts.EnableParseableModuleInterface |=
167-
Args.hasArg(OPT_enable_parseable_module_interface);
168166
Opts.EnableSerializationNestedTypeLookupTable &=
169167
!Args.hasArg(OPT_disable_serialization_nested_type_lookup_table);
170168

‎lib/Frontend/Frontend.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,7 @@ bool CompilerInstance::setUpModuleLoaders() {
292292
enableResilience,
293293
getDependencyTracker()));
294294
}
295-
auto MLM = ModuleLoadingMode::OnlySerialized;
296-
if (Invocation.getFrontendOptions().EnableParseableModuleInterface) {
297-
MLM = ModuleLoadingMode::PreferSerialized;
298-
}
295+
auto MLM = ModuleLoadingMode::PreferSerialized;
299296
if (auto forceModuleLoadingMode =
300297
llvm::sys::Process::GetEnv("SWIFT_FORCE_MODULE_LOADING")) {
301298
if (*forceModuleLoadingMode == "prefer-parseable")

‎lib/Frontend/ParseableInterfaceModuleLoader.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ class swift::ParseableInterfaceBuilder {
258258
void configureSubInvocationInputsAndOutputs(StringRef OutPath) {
259259
auto &SubFEOpts = subInvocation.getFrontendOptions();
260260
SubFEOpts.RequestedAction = FrontendOptions::ActionType::EmitModuleOnly;
261-
SubFEOpts.EnableParseableModuleInterface = true;
262261
SubFEOpts.InputsAndOutputs.addPrimaryInputFile(interfacePath);
263262
SupplementaryOutputPaths SOPs;
264263
SOPs.ModuleOutputPath = OutPath.str();
@@ -713,9 +712,6 @@ class ParseableInterfaceModuleLoaderImpl {
713712
if (validationInfo.status != serialization::Status::Valid)
714713
return false;
715714

716-
assert(validationInfo.name == moduleName &&
717-
"we built a module at this path with a different name?");
718-
719715
return dependenciesAreUpToDate(allDeps);
720716
}
721717

‎test/ParseableInterface/ModuleCache/ObjCAttrWithoutFoundation.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// swift-module-flags: -module-name ObjCAttrWithoutFoundation -enable-resilience -enable-objc-interop
33

44
// RUN: %empty-directory(%t)
5-
// RUN: echo 'import ObjCAttrWithoutFoundation' | %target-swift-frontend -typecheck -enable-parseable-module-interface -module-cache-path %t -I %S -
5+
// RUN: echo 'import ObjCAttrWithoutFoundation' | %target-swift-frontend -typecheck -module-cache-path %t -I %S -
66

77
public class MyClass {
88
public init()

‎test/ParseableInterface/ModuleCache/SerializedSIL.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// swift-module-flags: -module-name SerializedSIL -enable-resilience
33

44
// RUN: %empty-directory(%t)
5-
// RUN: echo 'import SerializedSIL' | %target-swift-frontend -typecheck -enable-parseable-module-interface -module-cache-path %t -I %S -
5+
// RUN: echo 'import SerializedSIL' | %target-swift-frontend -typecheck -module-cache-path %t -I %S -
66
// RUN: %target-sil-opt -disable-sil-linking %t/SerializedSIL-*.swiftmodule -module-name SerializedSIL > %t/SerializedSIL.sil
77
// RUN: %FileCheck %s < %t/SerializedSIL.sil
88
// RUN: %FileCheck -check-prefix NEGATIVE %s < %t/SerializedSIL.sil

‎test/ParseableInterface/ModuleCache/WrongName.swiftinterface

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
// swift-module-flags: -module-name DreadPirateRoberts
33

44
// RUN: %empty-directory(%t)
5-
// RUN: echo 'import WrongName' | not %target-swift-frontend -typecheck -enable-parseable-module-interface -module-cache-path %t -I %S - 2>&1 | %FileCheck %s
5+
// RUN: echo 'import WrongName' | not %target-swift-frontend -typecheck -module-cache-path %t -I %S - 2>&1 | %FileCheck %s
66

77
// CHECK: :1:8: error: cannot load module 'DreadPirateRoberts' as 'WrongName'

‎test/ParseableInterface/ModuleCache/force-module-loading-mode-archs.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// RUN: not env SWIFT_FORCE_MODULE_LOADING=only-parseable %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s -I %t 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
1818
// RUN: not env SWIFT_FORCE_MODULE_LOADING=only-serialized %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s -I %t 2>&1 | %FileCheck -check-prefix=NO-SUCH-MODULE %s
1919
// (default)
20-
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -I %t %s 2>&1 | %FileCheck -check-prefix=NO-SUCH-MODULE %s
20+
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -I %t %s 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
2121

2222
// 3. Only module is present.
2323
// RUN: %empty-directory(%t/Lib.swiftmodule)
@@ -54,7 +54,7 @@
5454
// RUN: not env SWIFT_FORCE_MODULE_LOADING=only-parseable %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s -I %t 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
5555
// RUN: not env SWIFT_FORCE_MODULE_LOADING=only-serialized %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s -I %t 2>&1 | %FileCheck -check-prefix=BAD-MODULE %s
5656
// (default)
57-
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -I %t %s 2>&1 | %FileCheck -check-prefix=BAD-MODULE %s
57+
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -I %t %s 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
5858

5959
// 6. Both are present but the module can't be opened.
6060
// RUN: chmod a-r %t/Lib.swiftmodule/%target-swiftmodule-name

‎test/ParseableInterface/ModuleCache/force-module-loading-mode-framework.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// RUN: not env SWIFT_FORCE_MODULE_LOADING=only-parseable %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s -F %t 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
1818
// RUN: not env SWIFT_FORCE_MODULE_LOADING=only-serialized %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s -F %t 2>&1 | %FileCheck -check-prefix=NO-SUCH-MODULE %s
1919
// (default)
20-
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -F %t %s 2>&1 | %FileCheck -check-prefix=NO-SUCH-MODULE %s
20+
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -F %t %s 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
2121

2222
// 3. Only module is present.
2323
// RUN: %empty-directory(%t/Lib.framework/Modules/Lib.swiftmodule)
@@ -54,7 +54,7 @@
5454
// RUN: not env SWIFT_FORCE_MODULE_LOADING=only-serialized %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s -F %t 2>&1 | %FileCheck -check-prefix=BAD-MODULE %s
5555
// RUN: %empty-directory(%t/MCP)
5656
// (default)
57-
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -F %t %s 2>&1 | %FileCheck -check-prefix=BAD-MODULE %s
57+
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -F %t %s 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
5858
// RUN: %empty-directory(%t/MCP)
5959

6060
// 6. Both are present but the module can't be opened.

‎test/ParseableInterface/ModuleCache/force-module-loading-mode.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// RUN: not env SWIFT_FORCE_MODULE_LOADING=only-parseable %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s -I %S/Inputs/force-module-loading-mode/ 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
1616
// RUN: not env SWIFT_FORCE_MODULE_LOADING=only-serialized %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s -I %S/Inputs/force-module-loading-mode/ 2>&1 | %FileCheck -check-prefix=NO-SUCH-MODULE %s
1717
// (default)
18-
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -I %S/Inputs/force-module-loading-mode/ %s 2>&1 | %FileCheck -check-prefix=NO-SUCH-MODULE %s
18+
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -I %S/Inputs/force-module-loading-mode/ %s 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
1919

2020
// 3. Only module is present.
2121
// RUN: sed -e 's/FromInterface/FromSerialized/g' %S/Inputs/force-module-loading-mode/Lib.swiftinterface | %target-swift-frontend -parse-stdlib -module-cache-path %t/MCP -emit-module-path %t/Lib.swiftmodule - -module-name Lib
@@ -51,7 +51,7 @@
5151
// RUN: not env SWIFT_FORCE_MODULE_LOADING=only-serialized %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP %s -I %t 2>&1 | %FileCheck -check-prefix=BAD-MODULE %s
5252
// RUN: %empty-directory(%t/MCP)
5353
// (default)
54-
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -I %t %s 2>&1 | %FileCheck -check-prefix=BAD-MODULE %s
54+
// RUN: not %target-swift-frontend -typecheck -parse-stdlib -module-cache-path %t/MCP -I %t %s 2>&1 | %FileCheck -check-prefix=FROM-INTERFACE %s
5555
// RUN: %empty-directory(%t/MCP)
5656

5757
// 6. Both are present but the module can't be opened.

‎test/ParseableInterface/ModuleCache/module-cache-bad-version.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
//
1717
// Try to build TestModule into a .swiftmodule explicitly using LeafModule via LeafModule.swiftinterface, but fail because version mismatch in LeafModule.swiftinterface.
1818
//
19-
// RUN: not %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s >%t/err.txt 2>&1
19+
// RUN: not %target-swift-frontend -I %t -module-cache-path %t/modulecache -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s >%t/err.txt 2>&1
2020
// RUN: test ! -f %t/TestModule.swiftmodule
2121
// RUN: test ! -f %t/modulecache/LeafModule-*.swiftmodule
2222
// RUN: %FileCheck %s -check-prefix=CHECK-ERR <%t/err.txt

‎test/ParseableInterface/ModuleCache/module-cache-deployment-target-irrelevant.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
//
1717
// Phase 2: build OtherModule into a .swiftinterface file with -target x86_64-macosx-10.10:
1818
//
19-
// RUN: %swift -target x86_64-apple-macosx10.10 -I %t -module-cache-path %t/modulecache -emit-parseable-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -enable-parseable-module-interface -typecheck
19+
// RUN: %swift -target x86_64-apple-macosx10.10 -I %t -module-cache-path %t/modulecache -emit-parseable-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -typecheck
2020
//
2121
// Phase 3: build TestModule in -target x86_64-apple-macosx10.11 and import both of these:
2222
//
23-
// RUN: %swift -target x86_64-apple-macosx10.11 -I %t -module-cache-path %t/modulecache -module-name TestModule %s -enable-parseable-module-interface -typecheck
23+
// RUN: %swift -target x86_64-apple-macosx10.11 -I %t -module-cache-path %t/modulecache -module-name TestModule %s -typecheck
2424
//
2525
// Phase 4: make sure we only compiled LeafModule and OtherModule one time:
2626
//

‎test/ParseableInterface/ModuleCache/module-cache-diagnostics.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
// RUN: %{python} %S/Inputs/make-old.py %t/leaf.swift %t/other.swift
2424
// RUN: %target-swift-frontend -I %t -emit-parseable-module-interface-path %t/LeafModule.swiftinterface -module-name LeafModule %t/leaf.swift -emit-module -o /dev/null
2525
// RUN: %{python} %S/Inputs/make-old.py %t/LeafModule.swiftinterface
26-
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-parseable-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -emit-module -o /dev/null
26+
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -emit-parseable-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -emit-module -o /dev/null
2727
// RUN: %{python} %S/Inputs/make-old.py %t/modulecache/LeafModule-*.swiftmodule %t/OtherModule.swiftinterface
28-
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s
28+
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s
2929
// RUN: %{python} %S/Inputs/make-old.py %t/modulecache/OtherModule-*.swiftmodule
3030
//
3131
//
@@ -38,7 +38,7 @@
3838
// RUN: %{python} %S/Inputs/make-old.py %t/LeafModule.swiftinterface
3939
// RUN: %{python} %S/Inputs/check-is-old.py %t/LeafModule.swiftinterface
4040
// RUN: rm %t/TestModule.swiftmodule
41-
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s >%t/warn.txt 2>&1
41+
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s >%t/warn.txt 2>&1
4242
// RUN: %{python} %S/Inputs/check-is-new.py %t/modulecache/OtherModule-*.swiftmodule %t/modulecache/LeafModule-*.swiftmodule
4343
// "check warn.txt exists and is empty"
4444
// RUN: test -e %t/warn.txt -a ! -s %t/warn.txt
@@ -53,7 +53,7 @@
5353
// RUN: %{python} %S/Inputs/make-old.py %t/LeafModule.swiftinterface
5454
// RUN: %{python} %S/Inputs/check-is-old.py %t/LeafModule.swiftinterface
5555
// RUN: rm %t/TestModule.swiftmodule
56-
// RUN: not %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s >%t/err.txt 2>&1
56+
// RUN: not %target-swift-frontend -I %t -module-cache-path %t/modulecache -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s >%t/err.txt 2>&1
5757
// RUN: %{python} %S/Inputs/check-is-old.py %t/modulecache/OtherModule-*.swiftmodule %t/modulecache/LeafModule-*.swiftmodule
5858
// RUN: %FileCheck %s -check-prefix=CHECK-ERROR <%t/err.txt
5959
// CHECK-ERROR: LeafModule.swiftinterface:7:8: error: no such module 'NotAModule'
@@ -64,7 +64,7 @@
6464
//
6565
// RUN: %{python} %S/Inputs/check-is-old.py %t/OtherModule.swiftinterface %t/LeafModule.swiftinterface
6666
// RUN: %{python} %S/Inputs/check-is-old.py %t/modulecache/OtherModule-*.swiftmodule %t/modulecache/LeafModule-*.swiftmodule
67-
// RUN: not %target-swift-frontend -I %t -module-cache-path %t/modulecache -serialize-diagnostics -serialize-diagnostics-path %t/err.dia -enable-parseable-module-interface -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s
67+
// RUN: not %target-swift-frontend -I %t -module-cache-path %t/modulecache -serialize-diagnostics -serialize-diagnostics-path %t/err.dia -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s
6868
// RUN: %{python} %S/Inputs/check-is-old.py %t/modulecache/OtherModule-*.swiftmodule %t/modulecache/LeafModule-*.swiftmodule
6969
// RUN: c-index-test -read-diagnostics %t/err.dia 2>&1 | %FileCheck %s -check-prefix=CHECK-ERROR
7070
//
@@ -76,7 +76,7 @@
7676
// RUN: %{python} %S/Inputs/make-old.py %t/LeafModule.swiftinterface
7777
// RUN: %{python} %S/Inputs/check-is-old.py %t/OtherModule.swiftinterface %t/LeafModule.swiftinterface
7878
// RUN: %{python} %S/Inputs/check-is-old.py %t/modulecache/OtherModule-*.swiftmodule %t/modulecache/LeafModule-*.swiftmodule
79-
// RUN: not %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s >%t/err-inline.txt 2>&1
79+
// RUN: not %target-swift-frontend -I %t -module-cache-path %t/modulecache -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s >%t/err-inline.txt 2>&1
8080
// RUN: %{python} %S/Inputs/check-is-old.py %t/modulecache/OtherModule-*.swiftmodule %t/modulecache/LeafModule-*.swiftmodule
8181
// RUN: %FileCheck %s -check-prefix=CHECK-ERROR-INLINE <%t/err-inline.txt
8282
// CHECK-ERROR-INLINE: LeafModule.swiftinterface:6:33: error: use of unresolved identifier 'unresolved'
@@ -87,7 +87,7 @@
8787
//
8888
// RUN: %{python} %S/Inputs/check-is-old.py %t/OtherModule.swiftinterface %t/LeafModule.swiftinterface
8989
// RUN: %{python} %S/Inputs/check-is-old.py %t/modulecache/OtherModule-*.swiftmodule %t/modulecache/LeafModule-*.swiftmodule
90-
// RUN: not %target-swift-frontend -I %t -module-cache-path %t/modulecache -serialize-diagnostics -serialize-diagnostics-path %t/err-inline.dia -enable-parseable-module-interface -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s
90+
// RUN: not %target-swift-frontend -I %t -module-cache-path %t/modulecache -serialize-diagnostics -serialize-diagnostics-path %t/err-inline.dia -emit-module -o %t/TestModule.swiftmodule -module-name TestModule %s
9191
// RUN: %{python} %S/Inputs/check-is-old.py %t/modulecache/OtherModule-*.swiftmodule %t/modulecache/LeafModule-*.swiftmodule
9292
// RUN: c-index-test -read-diagnostics %t/err-inline.dia 2>&1 | %FileCheck %s -check-prefix=CHECK-ERROR-INLINE
9393

‎test/ParseableInterface/ModuleCache/module-cache-effective-version-irrelevant.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
//
1414
// Phase 2: build OtherModule into a .swiftinterface file with -swift-version 4.2:
1515
//
16-
// RUN: %target-swift-frontend -swift-version 4.2 -I %t -module-cache-path %t/modulecache -emit-parseable-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -enable-parseable-module-interface -typecheck
16+
// RUN: %target-swift-frontend -swift-version 4.2 -I %t -module-cache-path %t/modulecache -emit-parseable-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -typecheck
1717
//
1818
// Phase 3: build TestModule in -swift-version 5 and import both of these:
1919
//
20-
// RUN: %target-swift-frontend -swift-version 5 -I %t -module-cache-path %t/modulecache -module-name TestModule %s -enable-parseable-module-interface -typecheck
20+
// RUN: %target-swift-frontend -swift-version 5 -I %t -module-cache-path %t/modulecache -module-name TestModule %s -typecheck
2121
//
2222
// Phase 4: make sure we only compiled LeafModule and OtherModule one time:
2323
//

‎test/ParseableInterface/ModuleCache/module-cache-errors-in-importing-file.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
// Actual test: compile and verify the import succeeds (i.e. we only report the error in this file)
1616
//
17-
// RUN: %target-swift-frontend -typecheck -verify -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface %s
17+
// RUN: %target-swift-frontend -typecheck -verify -I %t -module-cache-path %t/modulecache %s
1818

1919
unresolved // expected-error {{use of unresolved identifier 'unresolved'}}
2020

‎test/ParseableInterface/ModuleCache/module-cache-init.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//
1818
// Phase 2: build OtherModule into a .swiftinterface _using_ LeafModule via LeafModule.swiftinterface, creating LeafModule-*.swiftmodule along the way.
1919
//
20-
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-parseable-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -emit-module -o /dev/null
20+
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -emit-parseable-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -emit-module -o /dev/null
2121
// RUN: test -f %t/OtherModule.swiftinterface
2222
// RUN: %FileCheck %s -check-prefix=CHECK-OTHERINTERFACE <%t/OtherModule.swiftinterface
2323
// CHECK-OTHERINTERFACE: OtherFunc
@@ -31,7 +31,7 @@
3131
//
3232
// Phase 3: build TestModule into a .swiftmodule explicitly us OtherModule via OtherModule.swiftinterface, creating OtherModule-*.swiftmodule along the way.
3333
//
34-
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -enable-parseable-module-interface -emit-module -emit-dependencies -emit-dependencies-path %t/TestModule.d -o %t/TestModule.swiftmodule -module-name TestModule %s
34+
// RUN: %target-swift-frontend -I %t -module-cache-path %t/modulecache -emit-module -emit-dependencies -emit-dependencies-path %t/TestModule.d -o %t/TestModule.swiftmodule -module-name TestModule %s
3535
// RUN: test -f %t/TestModule.swiftmodule
3636
// RUN: test -f %t/modulecache/OtherModule-*.swiftmodule
3737
// RUN: test -f %t/TestModule.d

0 commit comments

Comments
 (0)