---

yaml
---
r: 345502
b: refs/heads/master
c: 5ef7fe3
h: refs/heads/master

Author: swift-ci

[refs]

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

trunk/include/swift/SIL/SILCloner.h

@@ -174,6 +174,12 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
     return asImpl().remapASTType(ty);
   }
 
+  void remapOpenedType(CanArchetypeType archetypeTy) {
+    auto existentialTy = archetypeTy->getOpenedExistentialType()->getCanonicalType();
+    auto replacementTy = ArchetypeType::getOpened(getOpASTType(existentialTy));
+    registerOpenedExistentialRemapping(archetypeTy, replacementTy);
+  }
+
   ProtocolConformanceRef getOpConformance(Type ty,
                                           ProtocolConformanceRef conformance) {
     // If we have open existentials to substitute, do so now.
@@ -1644,10 +1650,7 @@ template<typename ImplClass>
 void
 SILCloner<ImplClass>::visitOpenExistentialAddrInst(OpenExistentialAddrInst *Inst) {
   // Create a new archetype for this opened existential type.
-  auto archetypeTy = Inst->getType().castTo<ArchetypeType>();
-  registerOpenedExistentialRemapping(
-      archetypeTy,
-      ArchetypeType::getOpened(archetypeTy->getOpenedExistentialType()));
+  remapOpenedType(Inst->getType().castTo<ArchetypeType>());
 
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   doPostProcess(Inst,
@@ -1661,10 +1664,7 @@ template <typename ImplClass>
 void SILCloner<ImplClass>::visitOpenExistentialValueInst(
     OpenExistentialValueInst *Inst) {
   // Create a new archetype for this opened existential type.
-  auto archetypeTy = Inst->getType().castTo<ArchetypeType>();
-  registerOpenedExistentialRemapping(
-      archetypeTy,
-      ArchetypeType::getOpened(archetypeTy->getOpenedExistentialType()));
+  remapOpenedType(Inst->getType().castTo<ArchetypeType>());
 
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   doPostProcess(Inst, getBuilder().createOpenExistentialValue(
@@ -1684,10 +1684,7 @@ visitOpenExistentialMetatypeInst(OpenExistentialMetatypeInst *Inst) {
     exType = exMetatype.getInstanceType();
     openedType = cast<MetatypeType>(openedType).getInstanceType();
   }
-  auto archetypeTy = cast<ArchetypeType>(openedType);
-  registerOpenedExistentialRemapping(
-      archetypeTy,
-      ArchetypeType::getOpened(archetypeTy->getOpenedExistentialType()));
+  remapOpenedType(cast<ArchetypeType>(openedType));
 
   if (!Inst->getOperand()->getType().canUseExistentialRepresentation(
           Inst->getModule(), ExistentialRepresentation::Class)) {
@@ -1711,10 +1708,7 @@ void
 SILCloner<ImplClass>::
 visitOpenExistentialRefInst(OpenExistentialRefInst *Inst) {
   // Create a new archetype for this opened existential type.
-  auto archetypeTy = Inst->getType().castTo<ArchetypeType>();
-  registerOpenedExistentialRemapping(
-      archetypeTy,
-      ArchetypeType::getOpened(archetypeTy->getOpenedExistentialType()));
+  remapOpenedType(Inst->getType().castTo<ArchetypeType>());
 
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   doPostProcess(Inst,
@@ -1728,10 +1722,7 @@ void
 SILCloner<ImplClass>::
 visitOpenExistentialBoxInst(OpenExistentialBoxInst *Inst) {
   // Create a new archetype for this opened existential type.
-  auto archetypeTy = Inst->getType().castTo<ArchetypeType>();
-  registerOpenedExistentialRemapping(
-      archetypeTy,
-      ArchetypeType::getOpened(archetypeTy->getOpenedExistentialType()));
+  remapOpenedType(Inst->getType().castTo<ArchetypeType>());
 
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   doPostProcess(Inst,
@@ -1745,10 +1736,7 @@ void
 SILCloner<ImplClass>::
 visitOpenExistentialBoxValueInst(OpenExistentialBoxValueInst *Inst) {
   // Create a new archetype for this opened existential type.
-  auto archetypeTy = Inst->getType().castTo<ArchetypeType>();
-  registerOpenedExistentialRemapping(
-      archetypeTy,
-      ArchetypeType::getOpened(archetypeTy->getOpenedExistentialType()));
+  remapOpenedType(Inst->getType().castTo<ArchetypeType>());
 
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   doPostProcess(Inst,

trunk/test/SILOptimizer/inline_subclass_existential.swift

@@ -0,0 +1,21 @@
+// RUN: %target-swift-frontend -emit-sil -primary-file %s | %FileCheck %s
+
+class C<T> {}
+protocol P {
+  func f()
+}
+
+// CHECK-LABEL: sil hidden [transparent] @$s27inline_subclass_existential3fooyyAA1P_AA1CCyxGXclF : $@convention(thin) <T> (@guaranteed C<T> & P) -> () {
+// CHECK: open_existential_ref %0 : $C<T> & P to $@opened("{{.*}}") C<T> & P
+// CHECK: return
+@_transparent
+func foo<T>(_ x: C<T> & P) {
+  x.f()
+}
+
+// CHECK-LABEL: sil hidden @$s27inline_subclass_existential3baryyAA1P_AA1CCySiGXcF : $@convention(thin) (@guaranteed C<Int> & P) -> () {
+// CHECK: open_existential_ref %0 : $C<Int> & P to $@opened("{{.*}}") C<Int> & P
+// CHECK: return
+func bar(_ x: C<Int> & P) {
+  foo(x)
+}