From 050dde2208ad96718526695eab894d7ba45d6d00 Mon Sep 17 00:00:00 2001 From: Doug Gregor Date: Thu, 6 Apr 2017 15:31:40 -0700 Subject: [PATCH] [ProtocolConformanceRef] Propagate concrete-lookup hack yet further. Fixes rdar://problem/31482855. (cherry picked from commit 5e7a63f69da2ae08e1070679f878f77b62ab584d) --- lib/AST/ProtocolConformance.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/AST/ProtocolConformance.cpp b/lib/AST/ProtocolConformance.cpp index 07a922f6bed93..840d21f501b0f 100644 --- a/lib/AST/ProtocolConformance.cpp +++ b/lib/AST/ProtocolConformance.cpp @@ -153,7 +153,9 @@ ProtocolConformanceRef::subst(Type origType, return ProtocolConformanceRef(lookupResults.front()); } - llvm_unreachable("Invalid conformance substitution"); + // FIXME: Rip this out once ConformanceAccessPaths are plumbed through + auto *M = proto->getParentModule(); + return *M->lookupConformance(substType, proto, nullptr); } Type