---

yaml
---
r: 345976
b: refs/heads/master
c: 8177651
h: refs/heads/master

Author: swift-ci

[refs]

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

trunk/lib/AST/ProtocolConformance.cpp

@@ -114,19 +114,21 @@ ProtocolConformanceRef::subst(Type origType,
 
   auto *proto = getRequirement();
 
+  // If the type is an existential, it must be self-conforming.
+  if (substType->isExistentialType()) {
+    auto optConformance =
+      proto->getModuleContext()->lookupExistentialConformance(substType, proto);
+    assert(optConformance && "existential type didn't self-conform");
+    return *optConformance;
+  }
+
   // Check the conformance map.
   if (auto result = conformances(origType->getCanonicalType(),
                                  substType, proto)) {
     return *result;
   }
 
-  // The only remaining case is that the type is an existential that
-  // self-conforms.
-  assert(substType->isExistentialType());
-  auto optConformance =
-    proto->getModuleContext()->lookupExistentialConformance(substType, proto);
-  assert(optConformance && "existential type didn't self-conform");
-  return *optConformance;
+  llvm_unreachable("Invalid conformance substitution");
 }
 
 Type