SILGen: Fix lowering of ArrayExpr to in-place ConvertingInitialization

Author: slavapestov

lib/SILGen/SILGenExpr.cpp

@@ -3684,6 +3684,8 @@ RValue RValueEmitter::visitArrayExpr(ArrayExpr *E, SGFContext C) {
   RValue arg(SGF, loc, arrayTy,
              emitEndVarargs(SGF, loc, std::move(varargsInfo)));
 
+  arg = scope.popPreservingValue(std::move(arg));
+
   // Add an argument label for init(arrayLiteral: T...) as the above tuple is of
   // the form (T...) with no label.
   assert(argLabels.size() == 1 && !argLabels[0].empty() &&
@@ -3693,8 +3695,8 @@ RValue RValueEmitter::visitArrayExpr(ArrayExpr *E, SGFContext C) {
   arg.rewriteType(newType->getCanonicalType());
 
   // Call the builtin initializer.
-  return scope.popPreservingValue(SGF.emitApplyAllocatingInitializer(
-      loc, init, std::move(arg), E->getType(), C));
+  return SGF.emitApplyAllocatingInitializer(
+      loc, init, std::move(arg), E->getType(), C);
 }
 
 RValue RValueEmitter::visitDictionaryExpr(DictionaryExpr *E, SGFContext C) {

test/SILGen/objc_bridging_array.swift

@@ -0,0 +1,41 @@
+
+// RUN: %target-swift-emit-silgen(mock-sdk: %clang-importer-sdk) %s | %FileCheck %s
+
+// REQUIRES: objc_interop
+
+import Foundation
+
+class Child : NSObject {}
+
+@objc protocol Parent {
+  var children: [Child] { get set }
+}
+
+func setChildren(p: Parent, c: Child) {
+  p.children = [c]
+}
+
+// CHECK-LABEL: sil hidden [ossa] @$s19objc_bridging_array11setChildren1p1cyAA6Parent_p_AA5ChildCtF : $@convention(thin) (@guaranteed Parent, @guaranteed Child) -> () {
+// CHECK: [[OPENED:%.*]] = open_existential_ref %0 : $Parent to $[[OPENED_TYPE:.* Parent]]
+// CHECK: [[COPIED:%.*]] = copy_value [[OPENED]] : $[[OPENED_TYPE]]
+// CHECK: [[LENGTH:%.*]] = integer_literal $Builtin.Word, 1
+// CHECK: [[FN:%.*]] = function_ref @$ss27_allocateUninitializedArrayySayxG_BptBwlF : $@convention(thin) <τ_0_0> (Builtin.Word) -> (@owned Array<τ_0_0>, Builtin.RawPointer)
+// CHECK: [[ARRAY_AND_BUFFER:%.*]] = apply [[FN]]<Child>([[LENGTH]]) : $@convention(thin) <τ_0_0> (Builtin.Word) -> (@owned Array<τ_0_0>, Builtin.RawPointer)
+// CHECK: ([[ARRAY:%.*]], [[BUFFER_PTR:%.*]]) = destructure_tuple [[ARRAY_AND_BUFFER]] : $(Array<Child>, Builtin.RawPointer)
+// CHECK: [[BUFFER:%.*]] = pointer_to_address [[BUFFER_PTR]] : $Builtin.RawPointer to [strict] $*Child
+// CHECK: [[CHILD:%.*]] = copy_value %1 : $Child
+// CHECK: store [[CHILD]] to [init] [[BUFFER]] : $*Child
+// CHECK: [[METATYPE:%.*]] = metatype $@thin Array<Child>.Type
+// CHECK: [[FN:%.*]] = function_ref @$sSa12arrayLiteralSayxGxd_tcfC : $@convention(method) <τ_0_0> (@owned Array<τ_0_0>, @thin Array<τ_0_0>.Type) -> @owned Array<τ_0_0>
+// CHECK: [[NEW_ARRAY:%.*]] = apply [[FN]]<Child>([[ARRAY]], [[METATYPE]]) : $@convention(method) <τ_0_0> (@owned Array<τ_0_0>, @thin Array<τ_0_0>.Type) -> @owned Array<τ_0_0>
+// CHECK: [[FN:%.*]] = function_ref @$sSa10FoundationE19_bridgeToObjectiveCSo7NSArrayCyF : $@convention(method) <τ_0_0> (@guaranteed Array<τ_0_0>) -> @owned NSArray
+// CHECK: [[BORROW_ARRAY:%.*]] = begin_borrow [[NEW_ARRAY]] : $Array<Child>
+// CHECK: [[BRIDGED_ARRAY:%.*]] = apply [[FN]]<Child>([[BORROW_ARRAY]]) : $@convention(method) <τ_0_0> (@guaranteed Array<τ_0_0>) -> @owned NSArray
+// CHECK: end_borrow [[BORROW_ARRAY]] : $Array<Child>
+// CHECK: destroy_value [[NEW_ARRAY]] : $Array<Child>
+// CHECK: [[FN:%.*]] = objc_method [[COPIED]] : $[[OPENED_TYPE]], #Parent.children!setter.1.foreign : <Self where Self : Parent> (Self) -> ([Child]) -> (), $@convention(objc_method) <τ_0_0 where τ_0_0 : Parent> (NSArray, τ_0_0) -> ()
+// CHECK: apply [[FN]]<[[OPENED_TYPE]]>([[BRIDGED_ARRAY]], [[COPIED]]) : $@convention(objc_method) <τ_0_0 where τ_0_0 : Parent> (NSArray, τ_0_0) -> ()
+// CHECK: destroy_value [[BRIDGED_ARRAY]] : $NSArray
+// CHECK: destroy_value [[COPIED]] : $[[OPENED_TYPE]]
+// CHECK: [[RESULT:%.*]] = tuple ()
+// CHECK: return [[RESULT]] : $()