Skip to content

Commit 9c657e4

Browse files
committed
Serialization: Fix a call to ProtocolConformanceRef::forAbstract()
1 parent 8bcd09a commit 9c657e4

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

lib/Serialization/Deserialization.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8734,6 +8734,7 @@ void ModuleFile::finishNormalConformance(NormalProtocolConformance *conformance,
87348734
for (const auto &req : proto->getRequirementSignature().getRequirements()) {
87358735
if (req.getKind() != RequirementKind::Conformance)
87368736
continue;
8737+
ASSERT(req.getFirstType()->isEqual(proto->getSelfInterfaceType()));
87378738
ProtocolDecl *proto = req.getProtocolDecl();
87388739
auto iter = conformancesForProtocols.find(proto);
87398740
if (iter != conformancesForProtocols.end()) {
@@ -8745,10 +8746,8 @@ void ModuleFile::finishNormalConformance(NormalProtocolConformance *conformance,
87458746
// conformance to an Objective-C protocol for anything important.
87468747
// There are no associated types and we don't emit a Swift conformance
87478748
// record.
8748-
//
8749-
// FIXME: Passing an empty Type() here temporarily.
87508749
reqConformances.push_back(ProtocolConformanceRef::forAbstract(
8751-
Type(), proto));
8750+
conformance->getType(), proto));
87528751
}
87538752
}
87548753
} else {

0 commit comments

Comments
 (0)