Skip to content

Commit 566e9df

Browse files
committed
Frontend: Remove -enable-resilience flag
1 parent f01e384 commit 566e9df

File tree

4 files changed

+1
-14
lines changed

4 files changed

+1
-14
lines changed

include/swift/Option/FrontendOptions.td

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

174-
def enable_resilience : Flag<["-"], "enable-resilience">,
175-
HelpText<"Deprecated, use -enable-library-evolution instead">;
176-
177174
}
178175

179176

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ bool ArgsToFrontendOptionsConverter::convert(
7373
Opts.EnablePrivateImports |= Args.hasArg(OPT_enable_private_imports);
7474
Opts.EnableLibraryEvolution |= Args.hasArg(OPT_enable_library_evolution);
7575

76-
// FIXME: Remove this flag
77-
Opts.EnableLibraryEvolution |= Args.hasArg(OPT_enable_resilience);
78-
7976
Opts.EnableImplicitDynamic |= Args.hasArg(OPT_enable_implicit_dynamic);
8077

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

test/Interpreter/SDK/objc_getClass.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// RUN: %target-build-swift-dylib(%t/%target-library-name(resilient_class)) -enable-library-evolution %S/../../Inputs/resilient_class.swift -emit-module -emit-module-path %t/resilient_class.swiftmodule -module-name resilient_class -I%t -L%t -lresilient_struct
77
// RUN: %target-codesign %t/%target-library-name(resilient_class)
88

9-
// RUN: %target-build-swift-dylib(%t/%target-library-name(resilient_objc_class)) -Xfrontend -enable-resilience %S/../../Inputs/resilient_objc_class.swift -emit-module -emit-module-path %t/resilient_objc_class.swiftmodule -module-name resilient_objc_class -I%t -L%t -lresilient_struct
9+
// RUN: %target-build-swift-dylib(%t/%target-library-name(resilient_objc_class)) -enable-library-evolution %S/../../Inputs/resilient_objc_class.swift -emit-module -emit-module-path %t/resilient_objc_class.swiftmodule -module-name resilient_objc_class -I%t -L%t -lresilient_struct
1010
// RUN: %target-codesign %t/%target-library-name(resilient_objc_class)
1111

1212
// RUN: %target-build-swift %s -L %t -I %t -lresilient_struct -lresilient_class -lresilient_objc_class -o %t/main %target-rpath(%t)

test/Serialization/resilience.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212
// RUN: %FileCheck -check-prefix=CHECK -check-prefix=RESILIENCE %s < %t/resilience2.dump.txt
1313
// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t/resilience2.dump.txt
1414

15-
// FIXME: The alternate -enable-resilience flag is going away soon.
16-
17-
// RUN: %target-swift-frontend -emit-module -o %t -enable-resilience %s
18-
// RUN: llvm-bcanalyzer -dump %t/resilience.swiftmodule > %t/resilience2.dump.txt
19-
// RUN: %FileCheck -check-prefix=CHECK -check-prefix=RESILIENCE %s < %t/resilience2.dump.txt
20-
// RUN: %FileCheck -check-prefix=NEGATIVE %s < %t/resilience2.dump.txt
21-
2215
// CHECK: <MODULE_BLOCK {{.*}}>
2316
// RESILIENCE: <RESILIENCE_STRATEGY abbrevid={{[0-9]+}} op0=1/>
2417
// FRAGILE-NOT: <RESILIENCE_STRATEGY abbrevid={{[0-9]+}}

0 commit comments

Comments
 (0)