Merge pull request #79091 from meg-gupta/fixapiscp

[6.1] Fix swift::areUsesWithinValueLifetime for guaranteed values

Author: meg-gupta

lib/SILOptimizer/Utils/OwnershipOptUtils.cpp

@@ -468,8 +468,15 @@ bool swift::areUsesWithinValueLifetime(SILValue value, ArrayRef<Operand *> uses,
     return false;
   }
   if (value->getOwnershipKind() == OwnershipKind::Guaranteed) {
+    // For guaranteed values, we have to find the borrow introducing guaranteed
+    // reference roots and then ensure uses are within all of their lifetimes.
+    // For simplicity, we only look through single forwarding operations to find
+    // a borrow introducer here.
     value = findOwnershipReferenceAggregate(value);
     BorrowedValue borrowedValue(value);
+    if (!borrowedValue) {
+      return false;
+    }
     if (!borrowedValue.isLocalScope()) {
       return true;
     }

test/SILOptimizer/outliner_ossa.sil

@@ -16,6 +16,7 @@ import Foundation
 
 struct DataWrapper {
   let data: Data
+  let otherData: Data
 }
 
 sil @getData : $@convention(thin) () -> @owned Data
@@ -200,6 +201,30 @@ bb0(%0: @owned $MyObject):
   return %51 : $Optional<NSData>
 }
 
+// Not optimized
+// CHECK-LABEL: sil [Osize] [ossa] @test_struct_guaranteed :
+// CHECK: objc_method
+// CHECK-LABEL: } // end sil function 'test_struct_guaranteed'
+sil [Osize] [ossa] @test_struct_guaranteed : $@convention(thin) (@owned MyObject) -> @owned Optional<NSData> {
+bb0(%0 : @owned $MyObject):
+  %1 = metatype $@objc_metatype MyObject.Type
+  %2 = function_ref @getData : $@convention(thin) () -> @owned Data
+  %3 = apply %2() : $@convention(thin) () -> @owned Data
+  %4 = begin_borrow %3 : $Data
+  %5 = struct $DataWrapper (%4 : $Data, %4 : $Data)
+  %6 = struct_extract %5 : $DataWrapper, #DataWrapper.data
+  %7 = function_ref @$s10Foundation4DataV19_bridgeToObjectiveCSo6NSDataCyF : $@convention(method) (@guaranteed Data) -> @owned NSData
+  %8 = apply %7(%6) : $@convention(method) (@guaranteed Data) -> @owned NSData
+  %9 = enum $Optional<NSData>, #Optional.some!enumelt, %8 : $NSData
+  end_borrow %4 : $Data
+  %11 = objc_method %1 : $@objc_metatype MyObject.Type, #MyObject.take!foreign : (MyObject.Type) -> (Data?) -> Data?, $@convention(objc_method) (Optional<NSData>, @objc_metatype MyObject.Type) -> @autoreleased Optional<NSData>
+  %12 = apply %11(%9, %1) : $@convention(objc_method) (Optional<NSData>, @objc_metatype MyObject.Type) -> @autoreleased Optional<NSData>
+  destroy_value %0 : $MyObject
+  destroy_value %3 : $Data
+  destroy_value %9 : $Optional<NSData>
+  return %12 : $Optional<NSData>
+}
+
 sil [Osize] [ossa] @test_dont_crash : $@convention(thin) (@owned MyObject) -> () {
 bb0(%0: @owned $MyObject):
   %35 = metatype $@objc_metatype MyObject.Type