---

yaml
---
r: 347162
b: refs/heads/master
c: e1ea272
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8574ae53a1c993393e46a0f92cd821c31d1e5083
+refs/heads/master: e1ea272cf30ad8dda92fed0a4f7a6eb23cc519ba
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/SILGen/SILGenPoly.cpp

@@ -241,7 +241,11 @@ static ManagedValue emitTransformExistential(SILGenFunction &SGF,
                    [&](SGFContext C) -> ManagedValue {
                      if (openedArchetype)
                        return SGF.manageOpaqueValue(state, loc, C);
-                     return input;
+                     if (input.isPlusOne(SGF))
+                       return input;
+                     if (C.isGuaranteedPlusZeroOk())
+                       return input;
+                     return input.copyUnmanaged(SGF, loc);
                    });
 
   return input;

trunk/test/IRGen/outlined_copy_addr.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir  -module-name outcopyaddr -primary-file %s | %FileCheck %s
+// RUN: %target-swift-frontend -emit-ir -enable-sil-ownership -module-name outcopyaddr -primary-file %s | %FileCheck %s
 
 public protocol BaseProt {
 }

trunk/test/SILGen/reabstract.swift

@@ -112,3 +112,23 @@ func testSharedOwnedOpaque(_ s: C, o: C) {
   let box = Box(t: evenLessFun)
   box.t(s, o)
 }
+
+// Make sure that when we generate the reabstraction thunk from Klass -> P, we
+// pass off the value at +1.
+// CHECK-LABEL: sil shared [transparent] [serializable] [reabstraction_thunk] [ossa] @$s10reabstract1P_pIegg_xIegg_AaBRzlTR : $@convention(thin) <τ_0_0 where τ_0_0 : P> (@guaranteed τ_0_0, @guaranteed @callee_guaranteed (@guaranteed P) -> ()) -> () {
+// CHECK: bb0([[ARG:%.*]] : @guaranteed $τ_0_0,
+// CHECK:   [[ARG_COPY:%.*]] = copy_value [[ARG]]
+// CHECK:   [[EXISTENTIAL:%.*]] = init_existential_ref [[ARG_COPY]]
+// CHECK:   [[BORROWED_EXISTENTIAL:%.*]] = begin_borrow [[EXISTENTIAL]]
+// CHECK:   apply {{%.*}}([[BORROWED_EXISTENTIAL]])
+// CHECK:   end_borrow [[BORROWED_EXISTENTIAL]]
+// CHECK:   destroy_value [[EXISTENTIAL]]
+// CHECK: } // end sil function '$s10reabstract1P_pIegg_xIegg_AaBRzlTR'
+protocol P : class {}
+class Klass : P { }
+extension P { static func crash(setup: ((Self) -> ())?) {} }
+func checkInitExistentialThunk() -> P? {
+  let cls : P.Type = Klass.self
+  cls.crash(setup: { (arg:  P) -> () in  })
+  return nil
+}