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

[cast-opt] When simplifying checked_cast_br, be sure to forward the failing value as the argument to the failure block.

Browse Source
This commit is contained in:
Michael Gottesman
2019-02-18 21:40:21 -08:00
parent 4886c9b53a
commit f6313d1b18
2 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/SILOptimizer/Utils/CastOptimizer.cpp
View File

@@ -831,8 +831,12 @@ CastOptimizer::simplifyCheckedCastBranchInst(CheckedCastBranchInst *Inst) {
return NewI;
}
// This exact cast will fail.
auto *NewI = Builder.createBranch(Loc, FailureBB);
// This exact cast will fail. With ownership enabled, we pass a copy of the
// original casts value to the failure block.
TinyPtrVector<SILValue> Args;
if (Builder.hasOwnership())
Args.push_back(Inst->getOperand());
auto *NewI = Builder.createBranch(Loc, FailureBB, Args);
EraseInstAction(Inst);
WillFailAction();
return NewI;
@@ -859,9 +863,11 @@ CastOptimizer::simplifyCheckedCastBranchInst(CheckedCastBranchInst *Inst) {
TargetType, isSourceTypeExact);
SILBuilderWithScope Builder(Inst, BuilderContext);
if (Feasibility == DynamicCastFeasibility::WillFail) {
auto *NewI = Builder.createBranch(Loc, FailureBB);
TinyPtrVector<SILValue> Args;
if (Builder.hasOwnership())
Args.push_back(Inst->getOperand());
auto *NewI = Builder.createBranch(Loc, FailureBB, Args);
EraseInstAction(Inst);
WillFailAction();
return NewI;