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

[ownership] Extract out SILOwnershipKind from ValueOwnershipKind into its own type and rename Invalid -> Any.

Browse Source 
This makes it easier to understand conceptually why a ValueOwnershipKind with
Any ownership is invalid and also allowed me to explicitly document the lattice
that relates ownership constraints/value ownership kinds.
This commit is contained in:
Michael Gottesman
2020-11-10 12:51:08 -08:00
parent 1ff9147b2b
commit c026e95cce
81 changed files with 548 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/SILOptimizer/Utils/CastOptimizer.cpp
View File

@@ -114,7 +114,7 @@ convertObjectToLoadableBridgeableType(SILBuilderWithScope &builder,
SILBasicBlock *castSuccessBB =
f->createBasicBlockAfter(dynamicCast.getInstruction()->getParent());
castSuccessBB->createPhiArgument(silBridgedTy, ValueOwnershipKind::Owned);
castSuccessBB->createPhiArgument(silBridgedTy, OwnershipKind::Owned);
// If we /are/ conditional and we do not need to bridge the load to the sil,
// then we just create our cast success block and branch from the end of the
@@ -155,8 +155,8 @@ convertObjectToLoadableBridgeableType(SILBuilderWithScope &builder,
auto *newFailureBlock = ccbi->getFailureBB();
SILValue defaultArg;
if (builder.hasOwnership()) {
defaultArg = newFailureBlock->createPhiArgument(
load->getType(), ValueOwnershipKind::Owned);
defaultArg = newFailureBlock->createPhiArgument(load->getType(),
OwnershipKind::Owned);
} else {
defaultArg = ccbi->getOperand();
}
@@ -574,14 +574,14 @@ static SILValue computeFinalCastedValue(SILBuilderWithScope &builder,
if (!innerBuilder.hasOwnership())
return newAI;
return failureBB->createPhiArgument(newAI->getType(),
ValueOwnershipKind::Owned);
OwnershipKind::Owned);
}());
innerBuilder.emitDestroyOperation(loc, valueToDestroy);
}
auto *condBrSuccessBB =
newAI->getFunction()->createBasicBlockAfter(newAI->getParent());
condBrSuccessBB->createPhiArgument(destLoweredTy, ValueOwnershipKind::Owned);
condBrSuccessBB->createPhiArgument(destLoweredTy, OwnershipKind::Owned);
builder.createCheckedCastBranch(loc, /* isExact*/ false, newAI,
destLoweredTy, destFormalTy,
condBrSuccessBB, failureBB);
@@ -1210,7 +1210,7 @@ SILInstruction *CastOptimizer::optimizeCheckedCastAddrBranchInst(
SuccessBB, FailureBB, Inst->getTrueBBCount(),
Inst->getFalseBBCount());
SuccessBB->createPhiArgument(Dest->getType().getObjectType(),
ValueOwnershipKind::Owned);
OwnershipKind::Owned);
B.setInsertionPoint(SuccessBB->begin());
// Store the result
B.createStore(Loc, SuccessBB->getArgument(0), Dest,
@@ -1247,7 +1247,7 @@ CastOptimizer::optimizeCheckedCastBranchInst(CheckedCastBranchInst *Inst) {
auto *fBlock = dynamicCast.getFailureBlock();
if (B.hasOwnership()) {
fBlock->replacePhiArgumentAndReplaceAllUses(0, mi->getType(),
ValueOwnershipKind::None);
OwnershipKind::None);
}
return B.createCheckedCastBranch(
dynamicCast.getLocation(), false /*isExact*/, mi,