[SILOpt] Run DestroyAddrHoisting in mandatory.

Run DestroyAddrHoisting in the pipeline where DestroyHoisting was
previously running.  Avoid extra ARC traffic that having no form of
destroy hoisting in the mandatory pipeline results in.

rdar://90495704

Author: nate-chandler

lib/SILOptimizer/PassManager/PassPipeline.cpp

@@ -176,8 +176,12 @@ static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
     P.addSILSkippingChecker();
 #endif
 
-  if (Options.shouldOptimize() && EnableDestroyHoisting) {
-    P.addDestroyHoisting();
+  if (Options.shouldOptimize()) {
+    if (EnableDestroyHoisting) {
+      P.addDestroyHoisting();
+    } else if (P.getOptions().DestroyHoisting == DestroyHoistingOption::On) {
+      P.addDestroyAddrHoisting();
+    }
   }
   P.addMandatoryInlining();
   P.addMandatorySILLinker();

test/SILOptimizer/capture_promotion_generic_context.sil

@@ -108,10 +108,10 @@ exit:
 // closure is invoked.
 // CHECK-LABEL: sil {{.*}}@call_generic_promotable_box_from_different_generic2 :
 // CHECK:       bb0(%0 : $*R<T>, %1 : $*E<(R<U>) -> Builtin.Int32>, %2 : $*Builtin.Int32):
-// CHECK:         %3 = load %1 : $*E<(R<U>) -> Builtin.Int32>
 // CHECK:         [[F:%.*]] = function_ref @$s23generic_promotable_box2Tf2nnni_n : $@convention(thin) <τ_0_0> (@in_guaranteed R<τ_0_0>, @in_guaranteed Builtin.Int32, @guaranteed E<(R<τ_0_0>) -> Builtin.Int32>) -> @out Builtin.Int32
-// CHECK-NEXT:    [[CLOSURE:%.*]] = partial_apply [callee_guaranteed] [[F]]<U>(%2, %3)
-// CHECK-NEXT:    retain_value %3
+// CHECK:         %4 = load %1 : $*E<(R<U>) -> Builtin.Int32>
+// CHECK-NEXT:    [[CLOSURE:%.*]] = partial_apply [callee_guaranteed] [[F]]<U>(%2, %4)
+// CHECK-NEXT:    retain_value %4
 // CHECK-NEXT:    return [[CLOSURE]]
 // CHECK: } // end sil function 'call_generic_promotable_box_from_different_generic2'
 sil [ossa] @call_generic_promotable_box_from_different_generic2 : $@convention(thin) <T, U: P> (@in_guaranteed R<T>, @in_guaranteed E<(R<U>)->Int>, @in Int) -> @owned @callee_guaranteed (@in_guaranteed R<U>) -> @out Int {

test/SILOptimizer/performance-annotations.swift

@@ -31,8 +31,6 @@ struct AllocatingStr : P {
   }
 }
 
-/* Currently disabled: rdar://90495704
-
 func noRTCallsForArrayGet(_ a: [Str], _ i: Int) -> Int {
   return a[i].x
 }
@@ -41,7 +39,6 @@ func noRTCallsForArrayGet(_ a: [Str], _ i: Int) -> Int {
 func callArrayGet(_ a: [Str]) -> Int {
   return noRTCallsForArrayGet(a, 0)
 }
-*/
 
 @_noLocks
 func arcOperations(_ x: Cl) -> Cl {