Merge pull request #28295 from gottesmm/pr-5dfaf35e4af5aa2b6e46e3db704bc973cd4e6d53

[pmo] Fix load [copy] like I fixed load_borrow.

Author: gottesmm

include/swift/Basic/STLExtras.h

@@ -639,12 +639,12 @@ inline T accumulate(const Container &C, T init, BinaryOperation op) {
 }
 
 template <typename Container, typename T>
-inline bool binary_search(const Container &C, T value) {
+inline bool binary_search(const Container &C, const T &value) {
   return std::binary_search(C.begin(), C.end(), value);
 }
 
 template <typename Container, typename T, typename BinaryOperation>
-inline bool binary_search(const Container &C, T value, BinaryOperation op) {
+inline bool binary_search(const Container &C, const T &value, BinaryOperation op) {
   return std::binary_search(C.begin(), C.end(), value, op);
 }
 

lib/SIL/OwnershipUtils.cpp

@@ -163,6 +163,13 @@ bool swift::getUnderlyingBorrowIntroducingValues(
       continue;
     }
 
+    // If v produces .none ownership, then we can ignore it. It is important
+    // that we put this before checking for guaranteed forwarding instructions,
+    // since we want to ignore guaranteed forwarding instructions that in this
+    // specific case produce a .none value.
+    if (v.getOwnershipKind() == ValueOwnershipKind::None)
+      continue;
+
     // Otherwise if v is an ownership forwarding value, add its defining
     // instruction
     if (isGuaranteedForwardingValue(v)) {
@@ -173,10 +180,9 @@ bool swift::getUnderlyingBorrowIntroducingValues(
       continue;
     }
 
-    // If v produces any ownership, then we can ignore it. Otherwise, we need to
-    // return false since this is an introducer we do not understand.
-    if (v.getOwnershipKind() != ValueOwnershipKind::None)
-      return false;
+    // Otherwise, this is an introducer we do not understand. Bail and return
+    // false.
+    return false;
   }
 
   return true;