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

factor some code for cleanup emission (which avoids creating an empty block

Browse Source 
in a common case) out into CleanupManager, where it can be used by lots of 
clients.  NFC.


Swift SVN r27044
This commit is contained in:
Chris Lattner
2015-04-06 21:40:43 +00:00
parent 22696e0884
commit 6dc6ecddf3
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/SILGen/SILGenPattern.cpp
View File

@@ -1855,7 +1855,7 @@ emitBoolDispatch(ArrayRef<RowToSpecialize> rows, ConsumableManagedValue src,
SILValue srcValue = src.getFinalManagedValue().forward(SGF);
// Extract the i1 from the Bool struct.
StructDecl *BoolStruct = dyn_cast<StructDecl>(Context.getBoolDecl());
StructDecl *BoolStruct = cast<StructDecl>(Context.getBoolDecl());
auto Members = BoolStruct->lookupDirect(Context.getIdentifier("value"));
assert(Members.size() == 1 &&
"Bool should have only one property with name 'value'");
@@ -2169,23 +2169,9 @@ emitStmtConditionWithBodyRec(LabeledConditionalStmt *CondStmt,
// Just branch on the condition. On failure, we unwind any active cleanups,
// on success we fall through to a new block.
SILBasicBlock *ContBB = gen.createBasicBlock();
SILBasicBlock *FailBB = CondFailDest.getBlock();
// If earlier parts of the condition have already emitted cleanups, then
// we need to run them on the exit from this boolean condition, and will
// need a block to emit the cleanups into. Otherwise, we can get away with
// a direct jump and avoid creating a pointless block.
if (gen.Cleanups.hasAnyActiveCleanups(CondFailDest.getDepth()))
FailBB = gen.createBasicBlock();
auto FailBB = gen.Cleanups.emitBlockForCleanups(CondFailDest, CondStmt);
gen.B.createCondBranch(expr, V, ContBB, FailBB);
// Emit cleanups on the failure path if needed.
if (FailBB != CondFailDest.getBlock()) {
gen.B.emitBlock(FailBB);
gen.Cleanups.emitBranchAndCleanups(CondFailDest, CondStmt);
}
// Finally, emit the continue block and keep emitting the rest of the
// condition.
gen.B.emitBlock(ContBB);