Skip to content

Commit 8e14023

Browse files
slavapestovslavapestov
authored
Merge pull request #23280 from slavapestov/enable-resilience-flag
Rename -enable-resilience to -enable-library-evolution and make it a driver flag
2 parents 744b157 + 1159af5 commit 8e14023

File tree

148 files changed

+332
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+332
-328
lines changed

‎cmake/modules/SwiftSource.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ function(_compile_swift_files
226226
list(APPEND swift_flags "-Xfrontend" "-sil-verify-all")
227227
endif()
228228

229-
# The standard library and overlays are always built with resilience.
229+
# The standard library and overlays are always built resiliently.
230230
if(SWIFTFILE_IS_STDLIB)
231-
list(APPEND swift_flags "-Xfrontend" "-enable-resilience")
231+
list(APPEND swift_flags "-enable-library-evolution")
232232
endif()
233233

234234
if(SWIFT_STDLIB_USE_NONATOMIC_RC)

‎docs/SIL.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3961,7 +3961,7 @@ unless the enum can be exhaustively switched in the current function, i.e. when
39613961
the compiler can be sure that it knows all possible present and future values
39623962
of the enum in question. This is generally true for enums defined in Swift, but
39633963
there are two exceptions: *non-frozen enums* declared in libraries compiled
3964-
with the ``-enable-resilience`` flag, which may grow new cases in the future in
3964+
with the ``-enable-library-evolution`` flag, which may grow new cases in the future in
39653965
an ABI-compatible way; and enums marked with the ``objc`` attribute, for which
39663966
other bit patterns are permitted for compatibility with C. All enums imported
39673967
from C are treated as "non-exhaustive" for the same reason, regardless of the

‎include/swift/AST/DiagnosticsSema.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ ERROR(indirect_case_without_payload,none,
13051305
ERROR(indirect_case_in_indirect_enum,none,
13061306
"enum case in 'indirect' enum cannot also be 'indirect'", ())
13071307
WARNING(enum_frozen_nonresilient,none,
1308-
"%0 has no effect without -enable-resilience", (DeclAttribute))
1308+
"%0 has no effect without -enable-library-evolution", (DeclAttribute))
13091309
WARNING(enum_frozen_nonpublic,none,
13101310
"%0 has no effect on non-public enums", (DeclAttribute))
13111311

‎include/swift/AST/Module.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ enum class ResilienceStrategy : unsigned {
117117
/// Public nominal types: resilient
118118
/// Non-inlinable function bodies: resilient
119119
///
120-
/// This is the behavior with -enable-resilience.
120+
/// This is the behavior with -enable-library-evolution.
121121
Resilient
122122
};
123123

‎include/swift/Frontend/FrontendOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class FrontendOptions {
214214
/// Enables the "fully resilient" resilience strategy.
215215
///
216216
/// \see ResilienceStrategy::Resilient
217-
bool EnableResilience = false;
217+
bool EnableLibraryEvolution = false;
218218

219219
/// Indicates that the frontend should emit "verbose" SIL
220220
/// (if asked to emit SIL).

‎include/swift/Option/FrontendOptions.td

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ def disable_objc_attr_requires_foundation_module :
174174
HelpText<"Disable requiring uses of @objc to require importing the "
175175
"Foundation module">;
176176

177-
def enable_resilience : Flag<["-"], "enable-resilience">,
178-
HelpText<"Compile the module to export resilient interfaces for all "
179-
"public declarations by default">;
180177
}
181178

182179

‎include/swift/Option/Options.td

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,10 @@ def module_cache_path : Separate<["-"], "module-cache-path">,
305305
Flags<[FrontendOption, DoesNotAffectIncrementalBuild, ArgumentIsPath]>,
306306
HelpText<"Specifies the Clang module cache path">;
307307

308+
def enable_library_evolution : Flag<["-"], "enable-library-evolution">,
309+
Flags<[FrontendOption, ParseableInterfaceOption]>,
310+
HelpText<"Build the module to allow binary-compatible library evolution">;
311+
308312
def module_name : Separate<["-"], "module-name">,
309313
Flags<[FrontendOption, ParseableInterfaceOption]>,
310314
HelpText<"Name of the module to build">;

‎include/swift/Sema/SourceLoader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ class SourceLoader : public ModuleLoader {
2525
private:
2626
ASTContext &Ctx;
2727
bool SkipBodies;
28-
bool EnableResilience;
28+
bool EnableLibraryEvolution;
2929

3030
explicit SourceLoader(ASTContext &ctx,
3131
bool skipBodies,
3232
bool enableResilience,
3333
DependencyTracker *tracker)
3434
: ModuleLoader(tracker), Ctx(ctx),
35-
SkipBodies(skipBodies), EnableResilience(enableResilience) {}
35+
SkipBodies(skipBodies), EnableLibraryEvolution(enableResilience) {}
3636

3737
public:
3838
static std::unique_ptr<SourceLoader>

‎lib/Driver/ToolChains.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ static void addCommonFrontendArgs(const ToolChain &TC, const OutputInfo &OI,
185185
inputArgs.AddLastArg(arguments, options::OPT_warn_implicit_overrides);
186186
inputArgs.AddLastArg(arguments, options::OPT_typo_correction_limit);
187187
inputArgs.AddLastArg(arguments, options::OPT_enable_app_extension);
188+
inputArgs.AddLastArg(arguments, options::OPT_enable_library_evolution);
188189
inputArgs.AddLastArg(arguments, options::OPT_enable_testing);
189190
inputArgs.AddLastArg(arguments, options::OPT_enable_private_imports);
190191
inputArgs.AddLastArg(arguments, options::OPT_g_Group);

‎lib/Frontend/ArgsToFrontendOptionsConverter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ bool ArgsToFrontendOptionsConverter::convert(
7171

7272
Opts.EnableTesting |= Args.hasArg(OPT_enable_testing);
7373
Opts.EnablePrivateImports |= Args.hasArg(OPT_enable_private_imports);
74-
Opts.EnableResilience |= Args.hasArg(OPT_enable_resilience);
74+
Opts.EnableLibraryEvolution |= Args.hasArg(OPT_enable_library_evolution);
7575
Opts.EnableImplicitDynamic |= Args.hasArg(OPT_enable_implicit_dynamic);
7676

7777
Opts.TrackSystemDeps |= Args.hasArg(OPT_track_system_dependencies);

‎lib/Frontend/Frontend.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,11 @@ bool CompilerInstance::setUpModuleLoaders() {
286286
if (hasSourceImport()) {
287287
bool immediate = FrontendOptions::isActionImmediate(
288288
Invocation.getFrontendOptions().RequestedAction);
289-
bool enableResilience = Invocation.getFrontendOptions().EnableResilience;
289+
bool enableLibraryEvolution =
290+
Invocation.getFrontendOptions().EnableLibraryEvolution;
290291
Context->addModuleLoader(SourceLoader::create(*Context,
291292
!immediate,
292-
enableResilience,
293+
enableLibraryEvolution,
293294
getDependencyTracker()));
294295
}
295296
auto MLM = ModuleLoadingMode::OnlySerialized;
@@ -531,7 +532,7 @@ ModuleDecl *CompilerInstance::getMainModule() {
531532
if (Invocation.getFrontendOptions().EnableImplicitDynamic)
532533
MainModule->setImplicitDynamicEnabled();
533534

534-
if (Invocation.getFrontendOptions().EnableResilience)
535+
if (Invocation.getFrontendOptions().EnableLibraryEvolution)
535536
MainModule->setResilienceStrategy(ResilienceStrategy::Resilient);
536537
}
537538
return MainModule;

‎lib/Sema/SourceLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ ModuleDecl *SourceLoader::loadModule(SourceLoc importLoc,
125125
bufferID = Ctx.SourceMgr.addNewSourceBuffer(std::move(inputFile));
126126

127127
auto *importMod = ModuleDecl::create(moduleID.first, Ctx);
128-
if (EnableResilience)
128+
if (EnableLibraryEvolution)
129129
importMod->setResilienceStrategy(ResilienceStrategy::Resilient);
130130
Ctx.LoadedModules[moduleID.first] = importMod;
131131

‎test/Compatibility/attr_inlinable_dynamic.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// RUN: %target-swift-frontend -typecheck %s -swift-version 4.2 -enable-objc-interop -disable-objc-attr-requires-foundation-module
44
// RUN: %target-swift-frontend -typecheck %s -swift-version 4.2 -enable-objc-interop -disable-objc-attr-requires-foundation-module -enable-testing
55

6-
// RUN: %target-swift-frontend -typecheck %s -swift-version 4 -enable-objc-interop -disable-objc-attr-requires-foundation-module -enable-resilience -verify
7-
// RUN: %target-swift-frontend -typecheck %s -swift-version 4 -enable-objc-interop -disable-objc-attr-requires-foundation-module -enable-testing -enable-resilience -verify
8-
// RUN: %target-swift-frontend -typecheck %s -swift-version 4.2 -enable-objc-interop -disable-objc-attr-requires-foundation-module -enable-resilience -verify
9-
// RUN: %target-swift-frontend -typecheck %s -swift-version 4.2 -enable-objc-interop -disable-objc-attr-requires-foundation-module -enable-testing -enable-resilience -verify
6+
// RUN: %target-swift-frontend -typecheck %s -swift-version 4 -enable-objc-interop -disable-objc-attr-requires-foundation-module -enable-library-evolution -verify
7+
// RUN: %target-swift-frontend -typecheck %s -swift-version 4 -enable-objc-interop -disable-objc-attr-requires-foundation-module -enable-testing -enable-library-evolution -verify
8+
// RUN: %target-swift-frontend -typecheck %s -swift-version 4.2 -enable-objc-interop -disable-objc-attr-requires-foundation-module -enable-library-evolution -verify
9+
// RUN: %target-swift-frontend -typecheck %s -swift-version 4.2 -enable-objc-interop -disable-objc-attr-requires-foundation-module -enable-testing -enable-library-evolution -verify
1010

1111
@objc internal enum InternalEnum: UInt8 {
1212
case dummy

‎test/Compatibility/attr_inlinable_swift42.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-typecheck-verify-swift -swift-version 4.2
22
// RUN: %target-typecheck-verify-swift -swift-version 4.2 -enable-testing
3-
// RUN: %target-typecheck-verify-swift -swift-version 4.2 -enable-resilience
4-
// RUN: %target-typecheck-verify-swift -swift-version 4.2 -enable-resilience -enable-testing
3+
// RUN: %target-typecheck-verify-swift -swift-version 4.2 -enable-library-evolution
4+
// RUN: %target-typecheck-verify-swift -swift-version 4.2 -enable-library-evolution -enable-testing
55

66
enum InternalEnum {
77
// expected-note@-1 {{type declared here}}

‎test/Compatibility/exhaustive_switch.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-typecheck-verify-swift -swift-version 4 -enable-resilience
1+
// RUN: %target-typecheck-verify-swift -swift-version 4 -enable-library-evolution
22

33
func foo(a: Int?, b: Int?) -> Int {
44
switch (a, b) {

‎test/DebugInfo/global_resilience.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// RUN: %empty-directory(%t)
33
//
44
// Compile the external swift module.
5-
// RUN: %target-swift-frontend -g -emit-module -enable-resilience \
5+
// RUN: %target-swift-frontend -g -emit-module -enable-library-evolution \
66
// RUN: -emit-module-path=%t/resilient_struct.swiftmodule \
77
// RUN: -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
88
//
9-
// RUN: %target-swift-frontend -g -I %t -emit-ir -enable-resilience %s -o - \
9+
// RUN: %target-swift-frontend -g -I %t -emit-ir -enable-library-evolution %s -o - \
1010
// RUN: | %FileCheck %s
1111
import resilient_struct
1212

‎test/DebugInfo/struct_resilience.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// RUN: %empty-directory(%t)
33
//
44
// Compile the external swift module.
5-
// RUN: %target-swift-frontend -g -emit-module -enable-resilience \
5+
// RUN: %target-swift-frontend -g -emit-module -enable-library-evolution \
66
// RUN: -emit-module-path=%t/resilient_struct.swiftmodule \
77
// RUN: -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
88
//
9-
// RUN: %target-swift-frontend -g -I %t -emit-ir -enable-resilience %s -o - \
9+
// RUN: %target-swift-frontend -g -I %t -emit-ir -enable-library-evolution %s -o - \
1010
// RUN: | %FileCheck %s
1111
//
12-
// RUN: %target-swift-frontend -g -I %t -emit-ir -enable-resilience %s -o - \
12+
// RUN: %target-swift-frontend -g -I %t -emit-ir -enable-library-evolution %s -o - \
1313
// RUN: -enable-resilience-bypass | %FileCheck %s --check-prefix=CHECK-LLDB
1414
import resilient_struct
1515

‎test/FixCode/fixits-switch-nonfrozen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: not %target-swift-frontend -emit-sil %s -emit-fixits-path %t.remap -enable-resilience -enable-nonfrozen-enum-exhaustivity-diagnostics -diagnostics-editor-mode
1+
// RUN: not %target-swift-frontend -emit-sil %s -emit-fixits-path %t.remap -enable-library-evolution -enable-nonfrozen-enum-exhaustivity-diagnostics -diagnostics-editor-mode
22
// RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %s.result
33

44
enum Runcible {

‎test/FixCode/fixits-switch-nonfrozen.swift.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: not %target-swift-frontend -emit-sil %s -emit-fixits-path %t.remap -enable-resilience -enable-nonfrozen-enum-exhaustivity-diagnostics -diagnostics-editor-mode
1+
// RUN: not %target-swift-frontend -emit-sil %s -emit-fixits-path %t.remap -enable-library-evolution -enable-nonfrozen-enum-exhaustivity-diagnostics -diagnostics-editor-mode
22
// RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %s.result
33

44
enum Runcible {

‎test/Frontend/sil-merge-partial-modules.swift

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

3-
// RUN: %target-swift-frontend -emit-module -primary-file %s %S/Inputs/sil-merge-partial-modules-other.swift -module-name test -enable-resilience -o %t/partial.a.swiftmodule
4-
// RUN: %target-swift-frontend -emit-module %s -primary-file %S/Inputs/sil-merge-partial-modules-other.swift -module-name test -enable-resilience -o %t/partial.b.swiftmodule
3+
// RUN: %target-swift-frontend -emit-module -primary-file %s %S/Inputs/sil-merge-partial-modules-other.swift -module-name test -enable-library-evolution -o %t/partial.a.swiftmodule
4+
// RUN: %target-swift-frontend -emit-module %s -primary-file %S/Inputs/sil-merge-partial-modules-other.swift -module-name test -enable-library-evolution -o %t/partial.b.swiftmodule
55

6-
// RUN: %target-swift-frontend -emit-module %t/partial.a.swiftmodule %t/partial.b.swiftmodule -module-name test -enable-resilience -sil-merge-partial-modules -disable-diagnostic-passes -disable-sil-perf-optzns -o %t/test.swiftmodule
6+
// RUN: %target-swift-frontend -emit-module %t/partial.a.swiftmodule %t/partial.b.swiftmodule -module-name test -enable-library-evolution -sil-merge-partial-modules -disable-diagnostic-passes -disable-sil-perf-optzns -o %t/test.swiftmodule
77

88
// RUN: %target-sil-opt %t/test.swiftmodule -disable-sil-linking > %t/dump.sil
99
// RUN: %FileCheck %s < %t/dump.sil

‎test/IRGen/archetype_resilience.sil

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// REQUIRES: OS=macosx
33

44
// RUN: %empty-directory(%t)
5-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
6-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_enum.swiftmodule -module-name=resilient_enum -I %t %S/../Inputs/resilient_enum.swift
7-
// RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience %s | %FileCheck %s
5+
// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
6+
// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_enum.swiftmodule -module-name=resilient_enum -I %t %S/../Inputs/resilient_enum.swift
7+
// RUN: %target-swift-frontend -I %t -emit-ir -enable-library-evolution %s | %FileCheck %s
88

99
sil_stage canonical
1010

‎test/IRGen/class_resilience.sil

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
3-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_class.swiftmodule -module-name=resilient_class %S/../Inputs/resilient_class.swift -I %t
4-
// RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience %s | %FileCheck %s
5-
// RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience -O %s
2+
// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
3+
// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_class.swiftmodule -module-name=resilient_class %S/../Inputs/resilient_class.swift -I %t
4+
// RUN: %target-swift-frontend -I %t -emit-ir -enable-library-evolution %s | %FileCheck %s
5+
// RUN: %target-swift-frontend -I %t -emit-ir -enable-library-evolution -O %s
66

77
// REQUIRES: CPU=x86_64
88

‎test/IRGen/class_resilience.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %{python} %utils/chex.py < %s > %t/class_resilience.swift
3-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
4-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_enum.swiftmodule -module-name=resilient_enum -I %t %S/../Inputs/resilient_enum.swift
5-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_class.swiftmodule -module-name=resilient_class -I %t %S/../Inputs/resilient_class.swift
6-
// RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience %t/class_resilience.swift | %FileCheck %t/class_resilience.swift --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime -DINT=i%target-ptrsize
7-
// RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience -O %t/class_resilience.swift
3+
// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
4+
// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_enum.swiftmodule -module-name=resilient_enum -I %t %S/../Inputs/resilient_enum.swift
5+
// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_class.swiftmodule -module-name=resilient_class -I %t %S/../Inputs/resilient_class.swift
6+
// RUN: %target-swift-frontend -I %t -emit-ir -enable-library-evolution %t/class_resilience.swift | %FileCheck %t/class_resilience.swift --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-%target-runtime -DINT=i%target-ptrsize
7+
// RUN: %target-swift-frontend -I %t -emit-ir -enable-library-evolution -O %t/class_resilience.swift
88

99
// CHECK: @"$s16class_resilience26ClassWithResilientPropertyC1s16resilient_struct4SizeVvpWvd" = hidden global [[INT]] 0
1010
// CHECK: @"$s16class_resilience26ClassWithResilientPropertyC5colors5Int32VvpWvd" = hidden global [[INT]] 0

‎test/IRGen/class_resilience_objc.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
3-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %t -enable-resilience -enable-objc-interop -emit-ir -o - -primary-file %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DINT=i%target-ptrsize
2+
// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
3+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %t -enable-library-evolution -enable-objc-interop -emit-ir -o - -primary-file %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DINT=i%target-ptrsize
44

55
// XFAIL: CPU=armv7k
66
// XFAIL: CPU=powerpc64le

‎test/IRGen/class_resilience_thunks.swift

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

3-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_class_thunks.swiftmodule -module-name=resilient_class_thunks %S/../Inputs/resilient_class_thunks.swift
3+
// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_class_thunks.swiftmodule -module-name=resilient_class_thunks %S/../Inputs/resilient_class_thunks.swift
44
// RUN: %target-swift-frontend -I %t -emit-ir %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize
55
// RUN: %target-swift-frontend -I %t -emit-ir -O %s
66

‎test/IRGen/class_update_callback_with_fixed_layout.sil

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -enable-resilience -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
2+
// RUN: %target-swift-frontend -emit-module -enable-library-evolution -emit-module-path=%t/resilient_struct.swiftmodule -module-name=resilient_struct %S/../Inputs/resilient_struct.swift
33

4-
// RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience %s -read-legacy-type-info-path=%S/Inputs/legacy_type_info/a.yaml | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DINT=i%target-ptrsize
5-
// RUN: %target-swift-frontend -I %t -emit-ir -enable-resilience -O %s -read-legacy-type-info-path=%S/Inputs/legacy_type_info/a.yaml
4+
// RUN: %target-swift-frontend -I %t -emit-ir -enable-library-evolution %s -read-legacy-type-info-path=%S/Inputs/legacy_type_info/a.yaml | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DINT=i%target-ptrsize
5+
// RUN: %target-swift-frontend -I %t -emit-ir -enable-library-evolution -O %s -read-legacy-type-info-path=%S/Inputs/legacy_type_info/a.yaml
66

77
// We only use fragile class layouts when Objective-C interop is enabled.
88

0 commit comments

Comments
 (0)