---

yaml
---
r: 345854
b: refs/heads/master
c: 1d4c7b6
h: refs/heads/master

Author: swift-ci

[refs]

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

trunk/lib/RemoteAST/RemoteAST.cpp

@@ -75,7 +75,6 @@ struct IRGenContext {
 
   static IRGenOptions createIRGenOptions() {
     IRGenOptions IROpts;
-    IROpts.EnableResilienceBypass = true;
     return IROpts;
   }
 
@@ -185,7 +184,7 @@ class RemoteASTContextImpl {
     VarDecl *member = findField(typeDecl, memberName);
 
     // If we found a member, try to find its offset statically.
-    if (member) {
+    if (member && member->hasStorage() && !typeDecl->isResilient()) {
       if (auto irgen = getIRGen()) {
         return getOffsetOfFieldFromIRGen(irgen->IGM, type, typeDecl,
                                           optMetadata, member);

trunk/lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp

@@ -747,9 +747,13 @@ static bool canReplaceCopiedArg(FullApplySite Apply,
       if (!DT->properlyDominates(AI, user))
         return false;
     } else {
+      // The caller has to guarantee that there are no other instructions which
+      // use the address. This is done in findInitExistential called from
+      // the constructor of ConcreteExistentialInfo.
       assert(isa<CopyAddrInst>(user) || isa<InitExistentialAddrInst>(user) ||
              isa<OpenExistentialAddrInst>(user) ||
              isa<DeallocStackInst>(user) ||
+             isa<ApplyInst>(user) || isa<TryApplyInst>(user) ||
              user->isDebugInstruction() && "Unexpected instruction");
     }
   }

trunk/test/SILOptimizer/sil_combine_concrete_existential.sil

@@ -409,3 +409,31 @@ bb0:
   %v = tuple ()
   return %v : $()
 }
+
+sil @takeany :  $@convention(thin) (@in_guaranteed AnyP) -> ()
+
+// CHECK-LABEL: sil @testWitnessCopiedSelfWithIndirectResult2 : $@convention(thin) () -> () {
+// CHECK: [[IN:%[0-9]+]] = alloc_stack $AnyP
+// CHECK: [[EA:%[0-9]+]] = init_existential_addr [[IN]]
+// CHECK: [[OUT:%[0-9]+]] = alloc_stack $StructOfAnyP
+// CHECK: witness_method $StructOfAnyP, #AnyP.returnsSelf!1 : <Self where Self : AnyP> (Self) -> () -> @dynamic_self Self : $@convention(witness_method: AnyP) <τ_0_0 where τ_0_0 : AnyP> (@in_guaranteed τ_0_0) -> @out StructOfAnyP
+// CHECK: apply %{{.*}}<StructOfAnyP>([[OUT]], [[EA]]) : $@convention(witness_method: AnyP) <τ_0_0 where τ_0_0 : AnyP> (@in_guaranteed τ_0_0) -> @out StructOfAnyP
+// CHECK-LABEL: } // end sil function 'testWitnessCopiedSelfWithIndirectResult2'
+sil @testWitnessCopiedSelfWithIndirectResult2 : $() -> () {
+bb0:
+  %a0 = alloc_stack $AnyP
+  %ie0 = init_existential_addr %a0 : $*AnyP, $StructOfAnyP
+  %f1 = function_ref @takeany :  $@convention(thin) (@in_guaranteed AnyP) -> ()
+  %c1 = apply %f1(%a0) :  $@convention(thin) (@in_guaranteed AnyP) -> ()
+  %a1 = alloc_stack $AnyP
+  copy_addr %a0 to [initialization] %a1 : $*AnyP
+  %o0 = open_existential_addr immutable_access %a1 : $*AnyP to $*@opened("7C4DAF8E-D722-11E8-920A-D0817AD9F6DD") AnyP
+  %a2 = alloc_stack $StructOfAnyP
+  %w0 = witness_method $@opened("7C4DAF8E-D722-11E8-920A-D0817AD9F6DD") AnyP, #AnyP.returnsSelf!1 : <Self where Self : AnyP> (Self) -> () -> @dynamic_self Self, %o0 : $*@opened("7C4DAF8E-D722-11E8-920A-D0817AD9F6DD") AnyP : $@convention(witness_method: AnyP) <τ_0_0 where τ_0_0 : AnyP> (@in_guaranteed τ_0_0) -> @out StructOfAnyP
+  %c0 = apply %w0<@opened("7C4DAF8E-D722-11E8-920A-D0817AD9F6DD") AnyP>(%a2, %o0) : $@convention(witness_method: AnyP) <τ_0_0 where τ_0_0 : AnyP> (@in_guaranteed τ_0_0) -> @out StructOfAnyP
+  dealloc_stack %a2 : $*StructOfAnyP
+  dealloc_stack %a1 : $*AnyP
+  dealloc_stack %a0 : $*AnyP
+  %v = tuple ()
+  return %v : $()
+}