averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SIL-opaque] Removed [Unconditional]CheckedCastValue

Browse Source
This commit is contained in:
Andrew Trick
2022-03-05 17:45:02 -08:00
parent 1c07c50cf8
commit 2fd4de411e
45 changed files with 24 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/SILOptimizer/Transforms/SimplifyCFG.cpp
View File

@@ -239,7 +239,6 @@ private:
bool simplifyBranchBlock(BranchInst *BI);
bool simplifyCondBrBlock(CondBranchInst *BI);
bool simplifyCheckedCastBranchBlock(CheckedCastBranchInst *CCBI);
bool simplifyCheckedCastValueBranchBlock(CheckedCastValueBranchInst *CCBI);
bool simplifyCheckedCastAddrBranchBlock(CheckedCastAddrBranchInst *CCABI);
bool simplifyTryApplyBlock(TryApplyInst *TAI);
bool simplifySwitchValueBlock(SwitchValueInst *SVI);
@@ -2471,49 +2470,6 @@ bool SimplifyCFG::simplifyCheckedCastBranchBlock(CheckedCastBranchInst *CCBI) {
return MadeChange;
}
bool SimplifyCFG::simplifyCheckedCastValueBranchBlock(
CheckedCastValueBranchInst *CCBI) {
// TODO: OSSA; handle cleanups for opaque cases (simplify_cfg_opaque.sil).
if (!EnableOSSARewriteTerminator && Fn.hasOwnership()) {
return false;
}
auto SuccessBB = CCBI->getSuccessBB();
auto FailureBB = CCBI->getFailureBB();
auto ThisBB = CCBI->getParent();
bool MadeChange = false;
CastOptimizer CastOpt(
FuncBuilder, nullptr /*SILBuilderContext*/,
/* replaceValueUsesAction */
[&MadeChange](SILValue oldValue, SILValue newValue) {
MadeChange = true;
},
/* replaceInstUsesAction */
[&MadeChange](SILInstruction *I, ValueBase *V) { MadeChange = true; },
/* eraseInstAction */
[&MadeChange](SILInstruction *I) {
MadeChange = true;
I->eraseFromParent();
},
/* willSucceedAction */
[&]() {
MadeChange |= removeIfDead(FailureBB);
addToWorklist(ThisBB);
},
/* willFailAction */
[&]() {
MadeChange |= removeIfDead(SuccessBB);
addToWorklist(ThisBB);
});
MadeChange |= bool(CastOpt.simplifyCheckedCastValueBranchInst(CCBI));
LLVM_DEBUG(if (MadeChange)
llvm::dbgs() << "simplify checked_cast_value block\n");
return MadeChange;
}
bool
SimplifyCFG::
simplifyCheckedCastAddrBranchBlock(CheckedCastAddrBranchInst *CCABI) {
@@ -2908,10 +2864,6 @@ bool SimplifyCFG::simplifyBlocks() {
case TermKind::CheckedCastBranchInst:
Changed |= simplifyCheckedCastBranchBlock(cast<CheckedCastBranchInst>(TI));
break;
case TermKind::CheckedCastValueBranchInst:
Changed |= simplifyCheckedCastValueBranchBlock(
cast<CheckedCastValueBranchInst>(TI));
break;
case TermKind::CheckedCastAddrBranchInst:
Changed |= simplifyCheckedCastAddrBranchBlock(cast<CheckedCastAddrBranchInst>(TI));
break;