Merge pull request #8597 from DougGregor/rdar-31482855

DougGregor · web-flow · commit d5d671f1fc04 · 2017-04-06T23:43:03.000-07:00
[ProtocolConformanceRef] Propagate concrete-lookup hack yet further.
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,9 @@ ProtocolConformanceRef::subst(Type origType,`
`153`	`153`	`return ProtocolConformanceRef(lookupResults.front());`
`154`	`154`	`}`
`155`	`155`
`156`		`- llvm_unreachable("Invalid conformance substitution");`
	`156`	`+ // FIXME: Rip this out once ConformanceAccessPaths are plumbed through`
	`157`	`+ auto *M = proto->getParentModule();`
	`158`	`+ return *M->lookupConformance(substType, proto, nullptr);`
`157`	`159`	`}`
`158`	`160`
`159`	`161`	`Type`