Merge pull request #78260 from meg-gupta/enableedgecase

Allow SimplifyCFG::simplifyArgument on borrowed values

Author: meg-gupta

lib/SILOptimizer/Transforms/SimplifyCFG.cpp

@@ -3730,8 +3730,6 @@ bool SimplifyCFG::simplifyArgument(SILBasicBlock *BB, unsigned i) {
     }
     if (inst->getOwnershipKind() == OwnershipKind::Owned)
       return !inst->getSingleUse();
-    if (BorrowedValue borrow = BorrowedValue(inst->getOperand(0)))
-      return borrow.isLocalScope();
     return false;
   };
 

test/SILOptimizer/simplify_cfg_ossa_bbargs.sil

@@ -266,7 +266,7 @@ bb3:
 }
 
 // CHECK-LABEL: sil [ossa] @test_simplify_enum_arg_guaranteed1 : 
-// CHECK: bb1([[ARG:%.*]] : @guaranteed $FakeOptional<Klass>)
+// CHECK: bb1([[ARG:%.*]] : @guaranteed $Klass)
 // CHECK-LABEL: } // end sil function 'test_simplify_enum_arg_guaranteed1'
 sil [ossa] @test_simplify_enum_arg_guaranteed1 : $@convention(thin) (@owned Klass) -> () {
 bb0(%0 : @owned $Klass):
@@ -290,7 +290,9 @@ bb2:
   return %t : $()
 }
 
-// CHECK: bb1([[ARG:%.*]] : @guaranteed $NonTrivialStruct)
+// CHECK-LABEL: sil [ossa] @test_simplify_enum_arg_guaranteed2 : 
+// CHECK: bb1([[ARG:%.*]] : @guaranteed $Klass)
+// CHECK-LABEL: } // end sil function 'test_simplify_enum_arg_guaranteed2'
 sil [ossa] @test_simplify_enum_arg_guaranteed2 : $@convention(thin) (@owned Klass) -> () {
 bb0(%0 : @owned $Klass):
   specify_test "simplify_cfg_simplify_argument @block[1] 0"

utils/build-presets.ini

@@ -1454,6 +1454,8 @@ skip-build-tvos
 skip-test-tvos
 skip-build-watchos
 skip-test-watchos
+skip-build-xros
+skip-test-xros
 
 [preset: buildbot_osx_package]
 mixin-preset=