Skip to content

Commit 5a6873b

Browse files
committed
[SILOptimizer] Remove DestroyHoisting pass.
It's no longer used.
1 parent 6b0fc18 commit 5a6873b

File tree

8 files changed

+7
-1270
lines changed

8 files changed

+7
-1270
lines changed

include/swift/SILOptimizer/PassManager/Passes.def

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@ PASS(DeadObjectElimination, "deadobject-elim",
184184
"Dead Object Elimination for Classes with Trivial Destruction")
185185
PASS(DefiniteInitialization, "definite-init",
186186
"Definite Initialization for Diagnostics")
187-
PASS(DestroyHoisting, "destroy-hoisting",
188-
"Hoisting of value destroys")
189187
PASS(DestroyAddrHoisting, "destroy-addr-hoisting",
190188
"Hoist destroy_addr for uniquely identified values")
191189
PASS(Devirtualizer, "devirtualizer",

lib/SILOptimizer/PassManager/PassPipeline.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,9 @@ static llvm::cl::opt<bool> SILViewSILGenCFG(
6161
"sil-view-silgen-cfg", llvm::cl::init(false),
6262
llvm::cl::desc("Enable the sil cfg viewer pass before diagnostics"));
6363

64-
llvm::cl::opt<bool>
65-
EnableDestroyHoisting("enable-destroy-hoisting", llvm::cl::init(false),
66-
llvm::cl::desc("Enable the DestroyHoisting pass."));
67-
68-
llvm::cl::opt<bool>
69-
EnableDeinitDevirtualizer("enable-deinit-devirtualizer", llvm::cl::init(false),
70-
llvm::cl::desc("Enable the DestroyHoisting pass."));
64+
llvm::cl::opt<bool> EnableDeinitDevirtualizer(
65+
"enable-deinit-devirtualizer", llvm::cl::init(false),
66+
llvm::cl::desc("Enable the DeinitDevirtualizer pass."));
7167

7268
// Temporary flag until the stdlib builds with ~Escapable
7369
llvm::cl::opt<bool>
@@ -218,9 +214,7 @@ static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
218214
#endif
219215

220216
if (Options.shouldOptimize()) {
221-
if (EnableDestroyHoisting) {
222-
P.addDestroyHoisting();
223-
} else if (P.getOptions().DestroyHoisting == DestroyHoistingOption::On) {
217+
if (P.getOptions().DestroyHoisting == DestroyHoistingOption::On) {
224218
P.addDestroyAddrHoisting();
225219
}
226220
}

lib/SILOptimizer/Transforms/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ target_sources(swiftSILOptimizer PRIVATE
1414
CopyPropagation.cpp
1515
DeadCodeElimination.cpp
1616
DeadObjectElimination.cpp
17-
DestroyHoisting.cpp
1817
Devirtualizer.cpp
1918
DifferentiabilityWitnessDevirtualizer.cpp
2019
EagerSpecializer.cpp

0 commit comments

Comments
 (0)