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-verifier] When we determine the OwnershipKind that select enum forwards, we should not look at the condition operand, just the case operands.

Browse Source 
rdar://29791263
This commit is contained in:
Michael Gottesman
2017-01-28 18:13:26 -08:00
parent e45d59d99c
commit b0e4c68f61
3 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/SIL/SILValue.cpp
View File

@@ -159,7 +159,11 @@ public:
ValueOwnershipKindVisitor(const ValueOwnershipKindVisitor &) = delete;
ValueOwnershipKindVisitor(ValueOwnershipKindVisitor &&) = delete;
ValueOwnershipKind visitForwardingInst(SILInstruction *I);
ValueOwnershipKind visitForwardingInst(SILInstruction *I,
ArrayRef<Operand> Ops);
ValueOwnershipKind visitForwardingInst(SILInstruction *I) {
return visitForwardingInst(I, I->getAllOperands());
}
ValueOwnershipKind visitValueBase(ValueBase *V) {
llvm_unreachable("unimplemented method on ValueBaseOwnershipVisitor");
@@ -348,8 +352,8 @@ NO_RESULT_OWNERSHIP_INST(CheckedCastAddrBranch)
// For a forwarding instruction, we loop over all operands and make sure that
// all non-trivial values have the same ownership.
ValueOwnershipKind
ValueOwnershipKindVisitor::visitForwardingInst(SILInstruction *I) {
ArrayRef<Operand> Ops = I->getAllOperands();
ValueOwnershipKindVisitor::visitForwardingInst(SILInstruction *I,
ArrayRef<Operand> Ops) {
// A forwarding inst without operands must be trivial.
if (Ops.empty())
return ValueOwnershipKind::Trivial;
@@ -406,7 +410,6 @@ FORWARDING_OWNERSHIP_INST(ConvertFunction)
FORWARDING_OWNERSHIP_INST(InitExistentialRef)
FORWARDING_OWNERSHIP_INST(OpenExistentialRef)
FORWARDING_OWNERSHIP_INST(RefToBridgeObject)
FORWARDING_OWNERSHIP_INST(SelectEnum)
FORWARDING_OWNERSHIP_INST(SelectValue)
FORWARDING_OWNERSHIP_INST(Struct)
FORWARDING_OWNERSHIP_INST(Tuple)
@@ -417,8 +420,14 @@ FORWARDING_OWNERSHIP_INST(MarkUninitialized)
#undef FORWARDING_OWNERSHIP_INST
ValueOwnershipKind
ValueOwnershipKindVisitor::
visitUncheckedBitwiseCastInst(UncheckedBitwiseCastInst *UBCI) {
ValueOwnershipKindVisitor::visitSelectEnumInst(SelectEnumInst *SEI) {
// We handle this specially, since a select enum forwards only its case
// values. We drop the first element since that is the condition element.
return visitForwardingInst(SEI, SEI->getAllOperands().drop_front());
}
ValueOwnershipKind ValueOwnershipKindVisitor::visitUncheckedBitwiseCastInst(
UncheckedBitwiseCastInst *UBCI) {
ValueOwnershipKind OpOwnership = UBCI->getOperand().getOwnershipKind();
bool ResultTypeIsTrivial = UBCI->getType().isTrivial(UBCI->getModule());