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

[di] When emitting element addresses to destroy fields, use begin_access [deinit].

Browse Source
This commit is contained in:
Michael Gottesman
2020-01-07 15:19:55 -08:00
parent 222b9deeab
commit b4cf1afd19
7 changed files with 62 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp
View File

@@ -2303,14 +2303,26 @@ SILValue LifetimeChecker::handleConditionalInitAssign() {
B.setInsertionPoint(TrueBB->begin());
SILValue EltPtr;
{
llvm::SmallVector<std::pair<SILValue, SILValue>, 4> EndBorrowList;
EltPtr = TheMemory.emitElementAddress(Elt, Loc, B, EndBorrowList);
using EndScopeKind = DIMemoryObjectInfo::EndScopeKind;
SmallVector<std::pair<SILValue, EndScopeKind>, 4> EndScopeList;
EltPtr =
TheMemory.emitElementAddressForDestroy(Elt, Loc, B, EndScopeList);
if (auto *DA = B.emitDestroyAddrAndFold(Loc, EltPtr))
Destroys.push_back(DA);
while (!EndBorrowList.empty()) {
SILValue Borrowed, Original;
std::tie(Borrowed, Original) = EndBorrowList.pop_back_val();
B.createEndBorrow(Loc, Borrowed, Original);
while (!EndScopeList.empty()) {
SILValue value;
EndScopeKind kind;
std::tie(value, kind) = EndScopeList.pop_back_val();
switch (kind) {
case EndScopeKind::Borrow:
B.createEndBorrow(Loc, value);
continue;
case EndScopeKind::Access:
B.createEndAccess(Loc, value, false /*can abort*/);
continue;
}
llvm_unreachable("Covered switch isn't covered!");
}
}
B.setInsertionPoint(ContBB->begin());
@@ -2364,15 +2376,27 @@ handleConditionalDestroys(SILValue ControlVariableAddr) {
// Utilities.
auto destroyMemoryElement = [&](SILLocation Loc, unsigned Elt) {
llvm::SmallVector<std::pair<SILValue, SILValue>, 4> EndBorrowList;
using EndScopeKind = DIMemoryObjectInfo::EndScopeKind;
SmallVector<std::pair<SILValue, EndScopeKind>, 4> EndScopeList;
SILValue EltPtr =
TheMemory.emitElementAddress(Elt, Loc, B, EndBorrowList);
TheMemory.emitElementAddressForDestroy(Elt, Loc, B, EndScopeList);
if (auto *DA = B.emitDestroyAddrAndFold(Loc, EltPtr))
Destroys.push_back(DA);
while (!EndBorrowList.empty()) {
SILValue Borrowed, Original;
std::tie(Borrowed, Original) = EndBorrowList.pop_back_val();
B.createEndBorrow(Loc, Borrowed, Original);
while (!EndScopeList.empty()) {
SILValue value;
EndScopeKind kind;
std::tie(value, kind) = EndScopeList.pop_back_val();
switch (kind) {
case EndScopeKind::Borrow:
B.createEndBorrow(Loc, value);
continue;
case EndScopeKind::Access:
B.createEndAccess(Loc, value, false /*can abort*/);
continue;
}
llvm_unreachable("Covered switch isn't covered!");
}
};