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

Merge pull request #30494 from gottesmm/pr-71e6912f769c828f0358528f1e46433cb7032362

Browse Source 
[ownership] Rename BorrowScopeIntroducingValue -> BorrowedValue and BorrowScopeOperand -> BorrowingOperand.
This commit is contained in:
Michael Gottesman
2020-03-18 21:41:33 -07:00
committed by GitHub
parent 5fba4b3e4c 47e74473f1
commit dbe0cfa561
6 changed files with 100 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/SILOptimizer/Transforms/SemanticARCOpts.cpp
View File

@@ -1190,7 +1190,7 @@ bool SemanticARCOptVisitor::visitBeginBorrowInst(BeginBorrowInst *bbi) {
//
// TODO: This needs a better name.
bool SemanticARCOptVisitor::performGuaranteedCopyValueOptimization(CopyValueInst *cvi) {
SmallVector<BorrowScopeIntroducingValue, 4> borrowScopeIntroducers;
SmallVector<BorrowedValue, 4> borrowScopeIntroducers;
// Find all borrow introducers for our copy operand. If we are unable to find
// all of the reproducers (due to pattern matching failure), conservatively
@@ -1269,8 +1269,8 @@ bool SemanticARCOptVisitor::performGuaranteedCopyValueOptimization(CopyValueInst
// dead end blocks that use the value in a non-consuming way.
//
// TODO: There may be some way of sinking this into the loop below.
bool haveAnyLocalScopes = llvm::any_of(
borrowScopeIntroducers, [](BorrowScopeIntroducingValue borrowScope) {
bool haveAnyLocalScopes =
llvm::any_of(borrowScopeIntroducers, [](BorrowedValue borrowScope) {
return borrowScope.isLocalScope();
});
@@ -1302,12 +1302,10 @@ bool SemanticARCOptVisitor::performGuaranteedCopyValueOptimization(CopyValueInst
return false;
SmallVector<Operand *, 8> scratchSpace;
SmallPtrSet<SILBasicBlock *, 4> visitedBlocks;
if (llvm::any_of(borrowScopeIntroducers,
[&](BorrowScopeIntroducingValue borrowScope) {
return !borrowScope.areUsesWithinScope(
destroys, scratchSpace, visitedBlocks,
getDeadEndBlocks());
})) {
if (llvm::any_of(borrowScopeIntroducers, [&](BorrowedValue borrowScope) {
return !borrowScope.areUsesWithinScope(
destroys, scratchSpace, visitedBlocks, getDeadEndBlocks());
})) {
return false;
}
}
@@ -1339,7 +1337,7 @@ bool SemanticARCOptVisitor::performGuaranteedCopyValueOptimization(CopyValueInst
}
if (llvm::any_of(borrowScopeIntroducers,
[&](BorrowScopeIntroducingValue borrowScope) {
[&](BorrowedValue borrowScope) {
return !borrowScope.areUsesWithinScope(
phiArgLR.getDestroyingUses(), scratchSpace,
visitedBlocks, getDeadEndBlocks());
@@ -1716,7 +1714,7 @@ public:
// function. To be conservative, assume that all other non-local scopes
// write to memory.
if (!value->isLocalScope()) {
if (value->kind == BorrowScopeIntroducingValueKind::SILFunctionArgument) {
if (value->kind == BorrowedValueKind::SILFunctionArgument) {
return answer(false);
}
@@ -1727,7 +1725,7 @@ public:
// TODO: This is disabled temporarily for guaranteed phi args just for
// staging purposes. Thus be conservative and assume true in these cases.
if (value->kind == BorrowScopeIntroducingValueKind::Phi) {
if (value->kind == BorrowedValueKind::Phi) {
return answer(true);
}