Skip to content

Commit 2cc58fe

Browse files
committed
Add a return value to SILBuilder::emitStoreBorrowOperation
1 parent 18f8507 commit 2cc58fe

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

include/swift/SIL/SILBuilder.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -896,19 +896,18 @@ class SILBuilder {
896896
/// [trivial].
897897
///
898898
/// * Otherwise, emit an actual store_borrow.
899-
void emitStoreBorrowOperation(SILLocation loc, SILValue src,
900-
SILValue destAddr) {
899+
SILInstruction *emitStoreBorrowOperation(SILLocation loc, SILValue src,
900+
SILValue destAddr) {
901901
if (!hasOwnership()) {
902-
return emitStoreValueOperation(loc, src, destAddr,
903-
StoreOwnershipQualifier::Unqualified);
904-
}
905-
906-
if (src->getType().isTrivial(getFunction())) {
907-
return emitStoreValueOperation(loc, src, destAddr,
908-
StoreOwnershipQualifier::Trivial);
902+
emitStoreValueOperation(loc, src, destAddr,
903+
StoreOwnershipQualifier::Unqualified);
904+
} else if (src->getType().isTrivial(getFunction())) {
905+
emitStoreValueOperation(loc, src, destAddr,
906+
StoreOwnershipQualifier::Trivial);
907+
} else {
908+
createStoreBorrow(loc, src, destAddr);
909909
}
910-
911-
createStoreBorrow(loc, src, destAddr);
910+
return &*std::prev(getInsertionPoint());
912911
}
913912

914913
MarkUninitializedInst *

0 commit comments

Comments
 (0)