Merge pull request swiftlang#35031 from gottesmm/pr-7b80c07cdbdd273eed31ca1f3a6e3c1b8e8cdf50

gottesmm · web-flow · commit 4f8556dc4192 · 2020-12-09T21:47:03.000-08:00
[ownership] Do not insert an end_borrow when calling emitEndBorrowOperation on a value with OwnershipKind::None.
diff --git a/include/swift/SIL/SILBuilder.h b/include/swift/SIL/SILBuilder.h
@@ -782,7 +782,7 @@ class SILBuilder {
   }
 
   void emitEndBorrowOperation(SILLocation loc, SILValue v) {
-    if (!hasOwnership())
+    if (!hasOwnership() || v.getOwnershipKind() == OwnershipKind::None)
       return;
     createEndBorrow(loc, v);
   }

Original file line number	Diff line number	Diff line change
`@@ -782,7 +782,7 @@ class SILBuilder {`
`782`	`782`	`}`
`783`	`783`
`784`	`784`	`void emitEndBorrowOperation(SILLocation loc, SILValue v) {`
`785`		`- if (!hasOwnership())`
	`785`	`+ if (!hasOwnership() \|\| v.getOwnershipKind() == OwnershipKind::None)`
`786`	`786`	`return;`
`787`	`787`	`createEndBorrow(loc, v);`
`788`	`788`	`}`