[sil-combine] Enable cond_fail elimination for ownership.

Author: gottesmm

lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp

@@ -1066,9 +1066,6 @@ SILInstruction *SILCombiner::visitRetainValueInst(RetainValueInst *RVI) {
 }
 
 SILInstruction *SILCombiner::visitCondFailInst(CondFailInst *CFI) {
-  if (CFI->getFunction()->hasOwnership())
-    return nullptr;
-
   // Remove runtime asserts such as overflow checks and bounds checks.
   if (RemoveCondFails)
     return eraseInstFromFunction(*CFI);

test/SILOptimizer/sil_combine_ossa.sil

@@ -528,11 +528,12 @@ bb0(%0 : @owned $HeapBufferStorage<T_0_0, T_0_1>):
   return %3 : $HeapBufferStorage<T_0_0, T_0_1>
 }
 
-// CHECK-LABEL: sil [ossa] @cond_fail_applied_to_zero_removal
-// XHECK: bb0
-// XHECK-NEXT: cond_fail
-// XHECK-NEXT: tuple ()
-// XHECK-NEXT: return
+// CHECK-LABEL: sil [ossa] @cond_fail_applied_to_zero_removal :
+// CHECK: bb0
+// CHECK-NEXT: cond_fail
+// CHECK-NEXT: tuple ()
+// CHECK-NEXT: return
+// CHECK: } // end sil function 'cond_fail_applied_to_zero_removal'
 sil [ossa] @cond_fail_applied_to_zero_removal : $@convention(thin) (Builtin.Int1) -> () {
 bb0(%0 : $Builtin.Int1):
   cond_fail %0 : $Builtin.Int1
@@ -2051,10 +2052,11 @@ bb0(%0 : $Int):
   return %8 : $()
 }
 
-// CHECK-LABEL: @remove_pointer_compare_to_zero_NE
-// XHECK-NOT: apply
-// XHECK: cond_fail
-// XHECK: unreachable
+// CHECK-LABEL: @remove_pointer_compare_to_zero_NE :
+// CHECK-NOT: apply
+// CHECK: cond_fail
+// CHECK: unreachable
+// CHECK: } // end sil function 'remove_pointer_compare_to_zero_NE'
 sil [ossa] @remove_pointer_compare_to_zero_NE : $@convention(thin) (Int) -> () {
 bb0(%0 : $Int):
   %1 = string_literal utf8 "ss"
@@ -2701,11 +2703,11 @@ bb0(%0 : $Builtin.RawPointer, %1 : $*Builtin.UnsafeValueBuffer, %2 : $*GenContai
 }
 
 
-// CHECK-LABEL:   sil [ossa] @remove_dead_code_after_cond_fail
-// XHECK:           [[Ref:%.*]] = integer_literal $Builtin.Int1, -1
-// XHECK-NEXT:      cond_fail [[Ref]]
-// XHECK-NEXT:      unreachable
-
+// CHECK-LABEL:   sil [ossa] @remove_dead_code_after_cond_fail :
+// CHECK:           [[Ref:%.*]] = integer_literal $Builtin.Int1, -1
+// CHECK-NEXT:      cond_fail [[Ref]]
+// CHECK-NEXT:      unreachable
+// CHECK: } // end sil function 'remove_dead_code_after_cond_fail'
 sil [ossa] @remove_dead_code_after_cond_fail : $@convention(thin) () -> (Int32) {
 bb0:
   %0 = integer_literal $Builtin.Int32, -2
@@ -2717,12 +2719,12 @@ bb0:
 
 
 // CHECK-LABEL:   sil [ossa] @dont_remove_code_after_cond_fail
-// XHECK:         bb0([[Cond:%.*]] : $Builtin.Int1):
-// XHECK-NEXT:      [[Ref:%.*]] = integer_literal $Builtin.Int32, -2
-// XHECK-NEXT:      cond_fail [[Cond]]
-// XHECK-NEXT:      [[Ret:%.*]] = struct $Int32 ([[Ref]] : $Builtin.Int32)
-// XHECK-NEXT:      return [[Ret]]
-
+// CHECK:         bb0([[Cond:%.*]] : $Builtin.Int1):
+// CHECK-NEXT:      [[Ref:%.*]] = integer_literal $Builtin.Int32, -2
+// CHECK-NEXT:      cond_fail [[Cond]]
+// CHECK-NEXT:      [[Ret:%.*]] = struct $Int32 ([[Ref]] : $Builtin.Int32)
+// CHECK-NEXT:      return [[Ret]]
+// CHECK: } // end sil function 'dont_remove_code_after_cond_fail'
 sil [ossa] @dont_remove_code_after_cond_fail : $@convention(thin) (Builtin.Int1) -> (Int32) {
 bb0(%0 : $Builtin.Int1):
   %1 = integer_literal $Builtin.Int32, -2