Skip to content

[OwnershipUtils] NFC: Two small cleanups. #67219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 11, 2023
Merged

[OwnershipUtils] NFC: Two small cleanups. #67219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
194904f
[OwnershipUtils] NFC: Deduplicated implementation.
nate-chandler Jul 5, 2023
0675454
[OwnershipUtils] NFC: Deleted dead declaration.
nate-chandler Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions include/swift/SIL/OwnershipUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ inline bool isForwardingConsume(SILValue value) {
// Ownership Def-Use Utilities
//===----------------------------------------------------------------------===//

bool findPointerEscape(BorrowedValue value);

/// Whether the specified OSSA-lifetime introducer has a pointer escape.
///
/// precondition: \p value introduces an OSSA-lifetime, either a BorrowedValue
Expand Down
22 changes: 4 additions & 18 deletions lib/SIL/Utils/OwnershipUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,24 +850,10 @@ void BorrowedValue::print(llvm::raw_ostream &os) const {

void BorrowedValue::getLocalScopeEndingInstructions(
SmallVectorImpl<SILInstruction *> &scopeEndingInsts) const {
assert(isLocalScope() && "Should only call this given a local scope");

switch (kind) {
case BorrowedValueKind::Invalid:
llvm_unreachable("Using invalid case?!");
case BorrowedValueKind::SILFunctionArgument:
llvm_unreachable("Should only call this with a local scope");
case BorrowedValueKind::BeginBorrow:
case BorrowedValueKind::LoadBorrow:
case BorrowedValueKind::Phi:
for (auto *use : value->getUses()) {
if (use->isLifetimeEnding()) {
scopeEndingInsts.push_back(use->getUser());
}
}
return;
}
llvm_unreachable("Covered switch isn't covered?!");
visitLocalScopeEndingUses([&](auto *use) {
scopeEndingInsts.push_back(use->getUser());
return true;
});
}

// Note: BorrowedLifetimeExtender assumes no intermediate values between a
Expand Down