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: Extend cond_fail by a second operand, which is a static string literal, indicating the failure reason.

Browse Source
This commit is contained in:
Erik Eckstein
2019-07-05 20:02:49 +02:00
parent 08ab7ea732
commit 237a3ef77f
18 changed files with 117 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1399,9 +1399,9 @@ static CondFailInst *getUnConditionalFail(SILBasicBlock *BB, SILValue Cond,
/// Creates a new cond_fail instruction, optionally with an xor inverted
/// condition.
static void createCondFail(CondFailInst *Orig, SILValue Cond, bool inverted,
SILBuilder &Builder) {
Builder.createCondFail(Orig->getLoc(), Cond, inverted);
static void createCondFail(CondFailInst *Orig, SILValue Cond, StringRef Message,
bool inverted, SILBuilder &Builder) {
Builder.createCondFail(Orig->getLoc(), Cond, Message, inverted);
}
/// Inverts the expected value of 'PotentialExpect' (if it is an expect
@@ -1643,7 +1643,7 @@ bool SimplifyCFG::simplifyCondBrBlock(CondBranchInst *BI) {
if (auto *TrueCFI = getUnConditionalFail(TrueSide, CFCondition, false)) {
LLVM_DEBUG(llvm::dbgs() << "replace with cond_fail:" << *BI);
SILBuilderWithScope Builder(BI);
createCondFail(TrueCFI, CFCondition, false, Builder);
createCondFail(TrueCFI, CFCondition, TrueCFI->getMessage(), false, Builder);
SILBuilderWithScope(BI).createBranch(BI->getLoc(), FalseSide, FalseArgs);
BI->eraseFromParent();
@@ -1655,7 +1655,7 @@ bool SimplifyCFG::simplifyCondBrBlock(CondBranchInst *BI) {
if (auto *FalseCFI = getUnConditionalFail(FalseSide, CFCondition, true)) {
LLVM_DEBUG(llvm::dbgs() << "replace with inverted cond_fail:" << *BI);
SILBuilderWithScope Builder(BI);
createCondFail(FalseCFI, CFCondition, true, Builder);
createCondFail(FalseCFI, CFCondition, FalseCFI->getMessage(), true, Builder);
SILBuilderWithScope(BI).createBranch(BI->getLoc(), TrueSide, TrueArgs);
BI->eraseFromParent();
@@ -2497,7 +2497,7 @@ static bool tryMoveCondFailToPreds(SILBasicBlock *BB) {
SILValue incoming = condArg->getIncomingPhiValue(Pred);
SILBuilderWithScope Builder(Pred->getTerminator());
createCondFail(CFI, incoming, inverted, Builder);
createCondFail(CFI, incoming, CFI->getMessage(), inverted, Builder);
}
CFI->eraseFromParent();
return true;