Skip to content

Commit 2d7e20e

Browse files
committed
Remove unused mode in OME
1 parent a32bfb0 commit 2d7e20e

File tree

4 files changed

+3
-26
lines changed

4 files changed

+3
-26
lines changed

include/swift/SILOptimizer/PassManager/Passes.def

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,6 @@ PASS(NestedSemanticFunctionCheck, "nested-semantic-function-check",
315315
PASS(NonTransparentFunctionOwnershipModelEliminator,
316316
"non-transparent-func-ownership-model-eliminator",
317317
"Eliminate Ownership Annotations from non-transparent SIL Functions")
318-
PASS(NonStdlibNonTransparentFunctionOwnershipModelEliminator,
319-
"non-stdlib-non-transparent-func-ownership-model-eliminator",
320-
"Eliminate Ownership Annotations from non-transparent SIL Functions only when not processing the stdlib.")
321318
PASS(RCIdentityDumper, "rc-id-dumper",
322319
"Print Reference Count Identities")
323320
PASS(AlwaysInlineInliner, "always-inline",

lib/SILOptimizer/Mandatory/OwnershipModelEliminator.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -651,9 +651,3 @@ SILTransform *swift::createNonTransparentFunctionOwnershipModelEliminator() {
651651
return new OwnershipModelEliminator(true /*skip transparent*/,
652652
false /*ignore stdlib*/);
653653
}
654-
655-
SILTransform *
656-
swift::createNonStdlibNonTransparentFunctionOwnershipModelEliminator() {
657-
return new OwnershipModelEliminator(true /*skip transparent*/,
658-
true /*ignore stdlib*/);
659-
}

lib/SILOptimizer/PassManager/PassManager.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,11 +392,10 @@ void SILPassManager::dumpPassInfo(const char *Title, unsigned TransIdx,
392392
}
393393

394394
bool SILPassManager::isMandatoryFunctionPass(SILFunctionTransform *sft) {
395-
return isMandatory || sft->getPassKind() ==
396-
PassKind::NonTransparentFunctionOwnershipModelEliminator ||
397-
sft->getPassKind() == PassKind::OwnershipModelEliminator ||
395+
return isMandatory ||
398396
sft->getPassKind() ==
399-
PassKind::NonStdlibNonTransparentFunctionOwnershipModelEliminator;
397+
PassKind::NonTransparentFunctionOwnershipModelEliminator ||
398+
sft->getPassKind() == PassKind::OwnershipModelEliminator;
400399
}
401400

402401
void SILPassManager::runPassOnFunction(unsigned TransIdx, SILFunction *F) {

test/SILOptimizer/ome_ignore_stdlib.sil

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)