Skip to content

Commit 259f9e3

Browse files
committed
[NFC] Rename requireNoStoreBorrowLocation -> requireNoGuaranteedAddressLocation
1 parent c2dfc2f commit 259f9e3

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

lib/SIL/Verifier/MemoryLifetimeVerifier.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class MemoryLifetimeVerifier {
9494

9595
/// Require that the location of addr is not an alloc_stack used for a
9696
/// store_borrow.
97-
void requireNoStoreBorrowLocation(SILValue addr, SILInstruction *where);
97+
void requireNoGuaranteedAddressLocation(SILValue addr, SILInstruction *where);
9898

9999
/// Register the destination address of a store_borrow as borrowed location.
100100
void registerStoreBorrowLocation(SILValue addr);
@@ -333,7 +333,7 @@ bool MemoryLifetimeVerifier::applyMayRead(Operand *argOp, SILValue addr) {
333333
return false;
334334
}
335335

336-
void MemoryLifetimeVerifier::requireNoStoreBorrowLocation(
336+
void MemoryLifetimeVerifier::requireNoGuaranteedAddressLocation(
337337
SILValue addr, SILInstruction *where) {
338338
if (isa<StoreBorrowInst>(addr)) {
339339
reportError("store-borrow location cannot be written",
@@ -683,7 +683,7 @@ void MemoryLifetimeVerifier::checkBlock(SILBasicBlock *block, Bits &bits) {
683683
switch (LI->getOwnershipQualifier()) {
684684
case LoadOwnershipQualifier::Take:
685685
locations.clearBits(bits, LI->getOperand());
686-
requireNoStoreBorrowLocation(LI->getOperand(), &I);
686+
requireNoGuaranteedAddressLocation(LI->getOperand(), &I);
687687
break;
688688
case LoadOwnershipQualifier::Copy:
689689
case LoadOwnershipQualifier::Trivial:
@@ -709,7 +709,7 @@ void MemoryLifetimeVerifier::checkBlock(SILBasicBlock *block, Bits &bits) {
709709
case StoreOwnershipQualifier::Unqualified:
710710
llvm_unreachable("unqualified store shouldn't be in ownership SIL");
711711
}
712-
requireNoStoreBorrowLocation(SI->getDest(), &I);
712+
requireNoGuaranteedAddressLocation(SI->getDest(), &I);
713713
break;
714714
}
715715
case SILInstructionKind::StoreBorrowInst: {
@@ -722,15 +722,15 @@ void MemoryLifetimeVerifier::checkBlock(SILBasicBlock *block, Bits &bits) {
722722
requireBitsSet(bits, CAI->getSrc(), &I);
723723
if (CAI->isTakeOfSrc()) {
724724
locations.clearBits(bits, CAI->getSrc());
725-
requireNoStoreBorrowLocation(CAI->getSrc(), &I);
725+
requireNoGuaranteedAddressLocation(CAI->getSrc(), &I);
726726
}
727727
if (CAI->isInitializationOfDest()) {
728728
requireBitsClear(bits & nonTrivialLocations, CAI->getDest(), &I);
729729
} else {
730730
requireBitsSet(bits | ~nonTrivialLocations, CAI->getDest(), &I);
731731
}
732732
locations.setBits(bits, CAI->getDest());
733-
requireNoStoreBorrowLocation(CAI->getDest(), &I);
733+
requireNoGuaranteedAddressLocation(CAI->getDest(), &I);
734734
break;
735735
}
736736
case SILInstructionKind::InjectEnumAddrInst: {
@@ -746,14 +746,14 @@ void MemoryLifetimeVerifier::checkBlock(SILBasicBlock *block, Bits &bits) {
746746
requireBitsSet(bits, IEAI->getOperand(), &I);
747747
}
748748
}
749-
requireNoStoreBorrowLocation(IEAI->getOperand(), &I);
749+
requireNoGuaranteedAddressLocation(IEAI->getOperand(), &I);
750750
break;
751751
}
752752
case SILInstructionKind::InitExistentialAddrInst:
753753
case SILInstructionKind::InitEnumDataAddrInst: {
754754
SILValue addr = I.getOperand(0);
755755
requireBitsClear(bits & nonTrivialLocations, addr, &I);
756-
requireNoStoreBorrowLocation(addr, &I);
756+
requireNoGuaranteedAddressLocation(addr, &I);
757757
break;
758758
}
759759
case SILInstructionKind::OpenExistentialAddrInst:
@@ -785,15 +785,15 @@ void MemoryLifetimeVerifier::checkBlock(SILBasicBlock *block, Bits &bits) {
785785
int enumIdx = locations.getLocationIdx(enumAddr);
786786
if (enumIdx >= 0)
787787
requireBitsSet(bits, enumAddr, &I);
788-
requireNoStoreBorrowLocation(enumAddr, &I);
788+
requireNoGuaranteedAddressLocation(enumAddr, &I);
789789
}
790790
break;
791791
}
792792
case SILInstructionKind::DestroyAddrInst: {
793793
SILValue opVal = cast<DestroyAddrInst>(&I)->getOperand();
794794
requireBitsSet(bits | ~nonTrivialLocations, opVal, &I);
795795
locations.clearBits(bits, opVal);
796-
requireNoStoreBorrowLocation(opVal, &I);
796+
requireNoGuaranteedAddressLocation(opVal, &I);
797797
break;
798798
}
799799
case SILInstructionKind::EndBorrowInst: {
@@ -816,7 +816,7 @@ void MemoryLifetimeVerifier::checkBlock(SILBasicBlock *block, Bits &bits) {
816816
locations.clearBits(bits, src);
817817
requireBitsClear(bits & nonTrivialLocations, dest, &I);
818818
locations.setBits(bits, dest);
819-
requireNoStoreBorrowLocation(dest, &I);
819+
requireNoGuaranteedAddressLocation(dest, &I);
820820
break;
821821
}
822822
case SILInstructionKind::CheckedCastAddrBranchInst: {
@@ -922,8 +922,8 @@ void MemoryLifetimeVerifier::checkFuncArgument(Bits &bits, Operand &argumentOp,
922922
SILArgumentConvention argumentConvention,
923923
SILInstruction *applyInst) {
924924
if (argumentConvention != SILArgumentConvention::Indirect_In_Guaranteed)
925-
requireNoStoreBorrowLocation(argumentOp.get(), applyInst);
926-
925+
requireNoGuaranteedAddressLocation(argumentOp.get(), applyInst);
926+
927927
switch (argumentConvention) {
928928
case SILArgumentConvention::Indirect_In_CXX:
929929
case SILArgumentConvention::Indirect_In:

0 commit comments

Comments
 (0)