averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Preserve SIL when merging modules"

Browse Source
This commit is contained in:
Slava Pestov
2017-09-14 19:04:18 -07:00
committed by GitHub
parent 2ba1ca2d8f
commit 7ea93d9ed0
5 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/AST/Module.cpp
View File

@@ -663,11 +663,13 @@ ModuleDecl::lookupConformance(Type type, ProtocolDecl *protocol) {
if (auto inherited = dyn_cast<InheritedProtocolConformance>(conformance)) {
// Dig out the conforming nominal type.
auto rootConformance = inherited->getRootNormalConformance();
auto conformingClass
auto conformingNominal
= rootConformance->getType()->getClassOrBoundGenericClass();
// Map up to our superclass's type.
auto superclassTy = type->getSuperclassForDecl(conformingClass);
Type superclassTy = type->getSuperclass();
while (superclassTy->getAnyNominal() != conformingNominal)
superclassTy = superclassTy->getSuperclass();
// Compute the conformance for the inherited type.
auto inheritedConformance = lookupConformance(superclassTy, protocol);