Update utility to allow end_borrow on addresses which have OwnershipKind::None

meg-gupta · meg-gupta · commit 69d67813384d · 2022-08-16T15:08:22.000-07:00
diff --git a/include/swift/SIL/SILBuilder.h b/include/swift/SIL/SILBuilder.h
@@ -774,7 +774,8 @@ class SILBuilder {
   }
 
   void emitEndBorrowOperation(SILLocation loc, SILValue v) {
-    if (!hasOwnership() || v->getOwnershipKind() == OwnershipKind::None)
+    if (!hasOwnership() || (!v->getType().isAddress() &&
+                            v->getOwnershipKind() == OwnershipKind::None))
       return;
     createEndBorrow(loc, v);
   }

Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,8 @@ class SILBuilder {`
`774`	`774`	`}`
`775`	`775`
`776`	`776`	`void emitEndBorrowOperation(SILLocation loc, SILValue v) {`
`777`		`- if (!hasOwnership() \|\| v->getOwnershipKind() == OwnershipKind::None)`
	`777`	`+ if (!hasOwnership() \|\| (!v->getType().isAddress() &&`
	`778`	`+ v->getOwnershipKind() == OwnershipKind::None))`
`778`	`779`	`return;`
`779`	`780`	`createEndBorrow(loc, v);`
`780`	`781`	`}`