Merge pull request #64709 from meg-gupta/dcefix

Don't DCE @owned phis that may have escaped

Author: swift-ci

lib/SILOptimizer/Transforms/DeadCodeElimination.cpp

@@ -276,7 +276,8 @@ void DCE::markLive() {
       }
       case SILInstructionKind::DestroyValueInst: {
         auto phi = PhiValue(I.getOperand(0));
-        if (phi && phi->isLexical()) {
+        // Disable DCE of phis which are lexical or may have a pointer escape.
+        if (phi && (phi->isLexical() || hasPointerEscape(phi))) {
           markInstructionLive(&I);
         }
         break;

test/SILOptimizer/dead_code_elimination_nontrivial_ossa.sil

@@ -1022,11 +1022,11 @@ bb0(%0 : $@sil_unmanaged AnyObject):
 
 sil @foo : $@convention(thin) () -> ()
 
-// CHECK-LABEL: sil [ossa] @test_escape : {{.*}} {
+// CHECK-LABEL: sil [ossa] @test_escape1 : {{.*}} {
 // CHECK: br bb1
 // CHECK: end_borrow
-// CHECK-LABEL: } // end sil function 'test_escape'
-sil [ossa] @test_escape : $@convention(thin) () -> () {
+// CHECK-LABEL: } // end sil function 'test_escape1'
+sil [ossa] @test_escape1 : $@convention(thin) () -> () {
 bb0:
   %13 = function_ref @foo : $@convention(thin) () -> ()
   %14 = partial_apply [callee_guaranteed] %13() : $@convention(thin) () -> ()
@@ -1044,6 +1044,27 @@ bb1(%21 : @owned $@noescape @callee_guaranteed () -> (), %22 : @guaranteed $@cal
   return %28: $()
 }
 
+// CHECK-LABEL: sil [ossa] @test_escape2 : {{.*}} {
+// CHECK: br bb1
+// CHECK: destroy_value
+// CHECK: destroy_value
+// CHECK-LABEL: } // end sil function 'test_escape2'
+sil [ossa] @test_escape2 : $@convention(thin) () -> () {
+bb0:
+  %13 = function_ref @foo : $@convention(thin) () -> ()
+  %14 = partial_apply [callee_guaranteed] %13() : $@convention(thin) () -> ()
+  %15 = convert_escape_to_noescape %14 : $@callee_guaranteed () -> () to $@noescape @callee_guaranteed () -> ()
+  %18 = mark_dependence %15 : $@noescape @callee_guaranteed () -> () on %14 : $@callee_guaranteed () -> ()
+  br bb1(%18 : $@noescape @callee_guaranteed () -> (), %14 : $@callee_guaranteed () -> ())
+
+bb1(%21 : @owned $@noescape @callee_guaranteed () -> (), %23 : @owned $@callee_guaranteed () -> ()):
+  %27 = apply %21() : $@noescape @callee_guaranteed () -> ()
+  destroy_value %21 : $@noescape @callee_guaranteed () -> ()
+  destroy_value %23 : $@callee_guaranteed () -> ()
+  %28 = tuple ()
+  return %28: $()
+}
+
 sil @use_klass : $@convention(thin) (@guaranteed Klass) -> ()
 
 // CHECK-LABEL: sil [ossa] @test_forwarded_phi1 :