Merge pull request #14072 from eeckstein/fix-objoutliner

Author: swift-ci

lib/SILOptimizer/Transforms/ObjectOutliner.cpp

@@ -377,19 +377,24 @@ bool ObjectOutliner::optimizeObjectAllocation(
   // Replace the alloc_ref by global_value + strong_retain instructions.
   SILBuilder B(ARI);
   GlobalValueInst *GVI = B.createGlobalValue(ARI->getLoc(), Glob);
-  B.createStrongRetain(ARI->getLoc(), GVI, B.getDefaultAtomicity());
+  bool hasToRetain = true;
   llvm::SmallVector<Operand *, 8> Worklist(ARI->use_begin(), ARI->use_end());
   while (!Worklist.empty()) {
     auto *Use = Worklist.pop_back_val();
     SILInstruction *User = Use->getUser();
     switch (User->getKind()) {
       case SILInstructionKind::DeallocRefInst:
+      case SILInstructionKind::SetDeallocatingInst:
+        hasToRetain = false;
         ToRemove.push_back(User);
         break;
       default:
         Use->set(GVI);
     }
   }
+  if (hasToRetain) {
+    B.createStrongRetain(ARI->getLoc(), GVI, B.getDefaultAtomicity());
+  }
   if (FindStringCall && NumTailElems > 16) {
     assert(&*std::next(ARI->getIterator()) != FindStringCall &&
            "FindStringCall must not be the next instruction after ARI because "

test/SILOptimizer/globalopt-iter.sil

@@ -8,10 +8,9 @@ class E : B { }
 
 // CHECK: sil @patatino : $@convention(thin) () -> () {
 // CHECK: bb0:
-// CHECK:  %0 = global_value @patatinoTv_ : $B             // user: %1
-// CHECK:  strong_retain %0 : $B                           // id: %1
-// CHECK: %2 = tuple ()                                   // user: %3
-// CHECK: return %2 : $()                                 // id: %3
+// CHECK:   %0 = global_value @patatinoTv_ : $B
+// CHECK:   %1 = tuple ()
+// CHECK:   return %1 : $()
 // CHECK: }
 
 sil @patatino : $@convention(thin) () -> () {

test/SILOptimizer/objectoutliner.sil

@@ -74,6 +74,24 @@ bb0:
   return %r : $()
 }
 
+// CHECK-LABEL: sil @handle_deallocation
+// CHECK:      global_value
+// CHECK-NEXT: ref_element_addr
+// CHECK-NEXT: tuple
+// CHECK-NEXT: return
+sil @handle_deallocation : $@convention(thin) () -> () {
+bb0:
+  %3 = integer_literal $Builtin.Int64, 3
+  %4 = struct $Int64 (%3 : $Builtin.Int64)
+  %5 = alloc_ref $Obj
+  %6 = ref_element_addr %5 : $Obj, #Obj.value
+  store %4 to %6 : $*Int64
+  set_deallocating %5 : $Obj
+  dealloc_ref %5 : $Obj
+  %r = tuple ()
+  return %r : $()
+}
+
 // CHECK-LABEL: sil @dont_outline_global_double_store
 // CHECK: alloc_ref
 // CHECK: store
@@ -203,5 +221,3 @@ bb0:
   %r = tuple ()
   return %r : $()
 }
-
-