[DestroyHoisting] Barriers use callee analysis.

Pass a BasicCalleeAnalysis instance to isDeinitBarrier.  This enables
LexicalDestroyHoisting to hoist destroys over applies of functions which
are not deinit barriers.

Author: nate-chandler

include/swift/SILOptimizer/Utils/CanonicalizeBorrowScope.h

@@ -160,7 +160,8 @@ MoveValueInst *foldDestroysOfCopiedLexicalBorrow(BeginBorrowInst *bbi,
 
 bool hoistDestroysOfOwnedLexicalValue(SILValue const value,
                                       SILFunction &function,
-                                      InstructionDeleter &deleter);
+                                      InstructionDeleter &deleter,
+                                      BasicCalleeAnalysis *calleeAnalysis);
 
 } // namespace swift
 

lib/SILOptimizer/Transforms/CopyPropagation.cpp

@@ -476,15 +476,16 @@ void CopyPropagation::run() {
       auto folded = foldDestroysOfCopiedLexicalBorrow(bbi, *domTree, deleter);
       if (!folded)
         break;
-      auto hoisted = hoistDestroysOfOwnedLexicalValue(folded, *f, deleter);
+      auto hoisted =
+          hoistDestroysOfOwnedLexicalValue(folded, *f, deleter, calleeAnalysis);
       // Keep running even if the new move's destroys can't be hoisted.
       (void)hoisted;
       firstRun = false;
     }
   }
   for (auto *argument : f->getArguments()) {
     if (argument->getOwnershipKind() == OwnershipKind::Owned) {
-      hoistDestroysOfOwnedLexicalValue(argument, *f, deleter);
+      hoistDestroysOfOwnedLexicalValue(argument, *f, deleter, calleeAnalysis);
     }
   }
   deleter.cleanupDeadInstructions();

lib/SILOptimizer/Utils/LexicalDestroyHoisting.cpp

@@ -51,11 +51,13 @@ struct Context final {
 
   InstructionDeleter &deleter;
 
+  BasicCalleeAnalysis *calleeAnalysis;
+
   Context(SILValue const &value, SILFunction &function,
-          InstructionDeleter &deleter)
+          InstructionDeleter &deleter, BasicCalleeAnalysis *calleeAnalysis)
       : value(value), definition(value->getDefiningInstruction()),
-        defBlock(value->getParentBlock()), function(function),
-        deleter(deleter) {
+        defBlock(value->getParentBlock()), function(function), deleter(deleter),
+        calleeAnalysis(calleeAnalysis) {
     assert(value->isLexical());
     assert(value->getOwnershipKind() == OwnershipKind::Owned);
   }
@@ -195,7 +197,7 @@ Dataflow::classifyInstruction(SILInstruction *instruction) {
                ? Classification::Barrier
                : Classification::Other;
   }
-  if (isDeinitBarrier(instruction, nullptr)) {
+  if (isDeinitBarrier(instruction, context.calleeAnalysis)) {
     return Classification::Barrier;
   }
   return Classification::Other;
@@ -386,13 +388,14 @@ bool run(Context &context) {
 }
 } // end namespace LexicalDestroyHoisting
 
-bool swift::hoistDestroysOfOwnedLexicalValue(SILValue const value,
-                                             SILFunction &function,
-                                             InstructionDeleter &deleter) {
+bool swift::hoistDestroysOfOwnedLexicalValue(
+    SILValue const value, SILFunction &function, InstructionDeleter &deleter,
+    BasicCalleeAnalysis *calleeAnalysis) {
   if (!value->isLexical())
     return false;
   if (value->getOwnershipKind() != OwnershipKind::Owned)
     return false;
-  LexicalDestroyHoisting::Context context(value, function, deleter);
+  LexicalDestroyHoisting::Context context(value, function, deleter,
+                                          calleeAnalysis);
   return LexicalDestroyHoisting::run(context);
 }

test/SILOptimizer/lexical_destroy_hoisting.sil

@@ -1,4 +1,6 @@
-// RUN: %target-sil-opt -copy-propagation -enable-sil-verify-all %s | %FileCheck %s
+// RUN: %target-sil-opt -compute-side-effects -copy-propagation -enable-sil-verify-all %s | %FileCheck %s
+
+// REQUIRES: swift_in_compiler
 
 import Builtin
 import Swift
@@ -7,6 +9,7 @@ import Swift
 // = DECLARATIONS                                                             {{
 // =============================================================================
 
+class X {}
 class C {
     weak var d: D?
 }
@@ -36,6 +39,11 @@ sil [ossa] @callee_optional_d_guaranteed: $@convention(thin) (@guaranteed Option
 sil [ossa] @synchronization_point : $@convention(thin) () -> ()
 sil [ossa] @modify_s : $@yield_once @convention(thin) () -> @yields @inout S
 sil [ossa] @barrier : $@convention(thin) () -> ()
+// This function is not a synchronization point.
+sil [ossa] @empty : $@convention(thin) () -> () {
+  %retval = tuple ()
+  return %retval : $()
+}
 
 
 // =============================================================================
@@ -471,6 +479,20 @@ bb0(%0 : @owned $Optional<@Sendable @callee_guaranteed () -> ()>):
   return %copy : $Optional<@callee_guaranteed () -> ()>
 }
 
+// Hoist over applies of non-barrier fns.
+// CHECK-LABEL: sil [ossa] @hoist_over_apply_of_non_barrier_fn : {{.*}} {
+// CHECK:         destroy_value
+// CHECK:         apply
+// CHECK-LABEL: } // end sil function 'hoist_over_apply_of_non_barrier_fn'
+sil [ossa] @hoist_over_apply_of_non_barrier_fn : $@convention(thin) (@owned X) -> () {
+entry(%instance : @owned $X):
+  %empty = function_ref @empty : $@convention(thin) () -> ()
+  apply %empty() : $@convention(thin) () -> ()
+  destroy_value %instance : $X
+  %retval = tuple ()
+  return %retval : $()
+}
+
 // =============================================================================
 // instruction tests                                                          }}
 // =============================================================================