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

SILBuilder: add an API to insert _after_ an instruction.

Browse Source 
... and use that API in FullApplySite::insertAfterInvocation.

Also change FullApplySite::insertAfterInvocation/insertAfterFullEvaluation to directly pass a SILBuilder instead of just an insertion point to the callback.
This makes more sense (given the function names) and simplifies the usages.

It's a NFC.
This commit is contained in:
Erik Eckstein
2020-10-16 16:23:13 +02:00
parent 6310dfcc93
commit 9a10ec7d58
8 changed files with 101 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/SILOptimizer/Mandatory/MandatoryInlining.cpp
View File

@@ -123,9 +123,9 @@ static bool fixupReferenceCounts(
});
if (!consumedInLoop) {
applySite.insertAfterInvocation([&](SILBasicBlock::iterator iter) {
SILBuilderWithScope(iter).createDestroyAddr(loc, stackLoc);
SILBuilderWithScope(iter).createDeallocStack(loc, stackLoc);
applySite.insertAfterInvocation([&](SILBuilder &builder) {
builder.createDestroyAddr(loc, stackLoc);
builder.createDeallocStack(loc, stackLoc);
});
}
v = stackLoc;
@@ -176,11 +176,11 @@ static bool fixupReferenceCounts(
// uses in the top of a diamond and need to insert a destroy after the
// apply since the leak will just cover the other path.
if (!consumedInLoop) {
applySite.insertAfterInvocation([&](SILBasicBlock::iterator iter) {
applySite.insertAfterInvocation([&](SILBuilder &builder) {
if (hasOwnership) {
SILBuilderWithScope(iter).createEndBorrow(loc, argument);
builder.createEndBorrow(loc, argument);
}
SILBuilderWithScope(iter).emitDestroyValueOperation(loc, copy);
builder.emitDestroyValueOperation(loc, copy);
});
}
v = argument;
@@ -217,8 +217,8 @@ static bool fixupReferenceCounts(
// Then insert destroys after the apply site since our value is not being
// consumed as part of the actual apply.
applySite.insertAfterInvocation([&](SILBasicBlock::iterator iter) {
SILBuilderWithScope(iter).emitDestroyValueOperation(loc, v);
applySite.insertAfterInvocation([&](SILBuilder &builder) {
builder.emitDestroyValueOperation(loc, v);
});
break;
}
@@ -263,8 +263,8 @@ static bool fixupReferenceCounts(
// Destroy the callee as the apply would have done if our function is not
// callee guaranteed.
if (!isCalleeGuaranteed) {
applySite.insertAfterInvocation([&](SILBasicBlock::iterator iter) {
SILBuilderWithScope(iter).emitDestroyValueOperation(loc, calleeValue);
applySite.insertAfterInvocation([&](SILBuilder &builder) {
builder.emitDestroyValueOperation(loc, calleeValue);
});
}
return invalidatedStackNesting;