---

yaml
---
r: 346085
b: refs/heads/master
c: 2a45687
h: refs/heads/master
i:
  346083: 469917f

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 24755cceade872e7a36addd3b459c141d1571ddd
+refs/heads/master: 2a45687d60bea939d8090526759216635bf7fd91
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/IRGen/LoadableByAddress.cpp

@@ -2453,8 +2453,10 @@ void LoadableByAddress::recreateSingleApply(SILInstruction *applyInst) {
       SILValue oldValue = oldYieldedValues[i];
       SILValue newValue = newYieldedValues[i];
 
-      // For now, just replace the value with an immediate load.
-      if (oldValue->getType() != newValue->getType()) {
+      // For now, just replace the value with an immediate load if the old value
+      // was direct.
+      if (oldValue->getType() != newValue->getType() &&
+          !oldValue->getType().isAddress()) {
         LoadOwnershipQualifier ownership;
         if (!F->hasQualifiedOwnership()) {
           ownership = LoadOwnershipQualifier::Unqualified;

trunk/test/IRGen/big_types_coroutine.sil

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -loadable-address -enable-sil-verify-all %s | %FileCheck %s
+// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -loadable-address -enable-sil-verify-all %s | %FileCheck %s
 
 // REQUIRES: CPU=x86_64
 // REQUIRES: OS=macosx
@@ -57,8 +57,8 @@ unwind:
 // CHECK-NEXT:    [[CORO:%.*]] = function_ref @test_yield_big : $@yield_once @convention(thin) () -> @yields @in_constant BigStruct
 // CHECK-NEXT:    ([[ADDR:%.*]], [[TOKEN:%.*]]) = begin_apply [[CORO]]()
 //   TODO: this isn't very efficient
-// CHECK-NEXT:    [[T0:%.*]] = load [trivial] [[ADDR]] : $*BigStruct
-// CHECK-NEXT:    store [[T0]] to [trivial] [[TEMP]] : $*BigStruct
+// CHECK-NEXT:    [[T0:%.*]] = load [[ADDR]] : $*BigStruct
+// CHECK-NEXT:    store [[T0]] to [[TEMP]] : $*BigStruct
 // CHECK-NEXT:    // function_ref
 // CHECK-NEXT:    [[USE:%.*]] = function_ref @use_big_struct : $@convention(thin) (@in_constant BigStruct) -> ()
 // CHECK-NEXT:    apply [[USE]]([[TEMP]])
@@ -76,3 +76,24 @@ entry:
   %ret = tuple ()
   return %ret : $()
 }
+
+sil @yield_fun_ptr2 : $@yield_once @convention(thin) () -> @yields @inout Optional<@callee_guaranteed (@guaranteed BigStruct) -> ()>
+
+// CHECK-LABEL: sil @yield_funptr : $
+// CHECK: (%1, %2) = begin_apply %0() : $@yield_once @convention(thin) () -> @yields @inout Optional<@callee_guaranteed (@in_guaranteed BigStruct) -> ()>
+// CHECK: yield %1
+sil @yield_funptr : $@yield_once @convention(thin) () -> @yields @inout Optional<@callee_guaranteed (@guaranteed BigStruct) -> ()> {
+bb0:
+  %2 = function_ref @yield_fun_ptr2 : $@yield_once @convention(thin) () -> @yields @inout Optional<@callee_guaranteed (@guaranteed BigStruct) -> ()>
+  (%3, %4) = begin_apply %2() : $@yield_once @convention(thin) () -> @yields @inout Optional<@callee_guaranteed (@guaranteed BigStruct) -> ()>
+  yield %3 : $*Optional<@callee_guaranteed (@guaranteed BigStruct) -> ()>, resume bb1, unwind bb2
+
+bb1:
+  end_apply %4
+  %7 = tuple ()
+  return %7 : $()
+
+bb2:
+  abort_apply %4
+  unwind
+}