---

yaml
---
r: 345047
b: refs/heads/master
c: 5b893d6
h: refs/heads/master
i:
  345045: b89cbd8
  345043: 7ccee8e
  345039: 1aa840e

Author: swift-ci

[refs]

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

trunk/lib/AST/ConformanceLookupTable.cpp

@@ -818,6 +818,8 @@ ConformanceLookupTable::getConformance(NominalTypeDecl *nominal,
     // declared.
     auto *conformingClass = cast<ClassDecl>(conformingNominal);
     Type superclassTy = type->getSuperclassForDecl(conformingClass);
+    if (superclassTy->is<ErrorType>())
+      return nullptr;
 
     // Look up the inherited conformance.
     ModuleDecl *module = entry->getDeclContext()->getParentModule();

trunk/validation-test/compiler_crashers_2_fixed/0171-sr-8642.swift

@@ -0,0 +1,10 @@
+// RUN: not %target-swift-frontend -typecheck %s
+
+protocol P {}
+protocol Q {}
+class A : P {}
+class B : A {}
+
+struct A<T:B> {
+  var x: T { fatalError("death") }
+}