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

Revert "Don't emit protocol conformance cross-references for conformances owned by Clang modules."

Browse Source 
This reverts commit r20828.

Swift SVN r20831
This commit is contained in:
Doug Gregor
2014-07-31 17:30:05 +00:00
parent 1aa74e8343
commit ae454c49d6
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/Serialization.cpp
View File

@@ -788,11 +788,7 @@ Serializer::writeConformance(const ProtocolDecl *protocol,
auto conf = cast<NormalProtocolConformance>(conformance); auto conf = cast<NormalProtocolConformance>(conformance);
// If the conformance comes from another module, write a reference to it. // If the conformance comes from another module, write a reference to it.
// We don't do this for Clang modules because there might not be if (conformance->getDeclContext()->getParentModule() != M) {
// anywhere to store the conformance. It will simply be regenerated.
if (conformance->getDeclContext()->getParentModule() != M &&
!ClangModuleUnit::hasClangModule(
conformance->getDeclContext()->getParentModule())) {
unsigned abbrCode = abbrCodes[XRefProtocolConformanceLayout::Code]; unsigned abbrCode = abbrCodes[XRefProtocolConformanceLayout::Code];
DeclID protoID = addDeclRef(conf->getProtocol()); DeclID protoID = addDeclRef(conf->getProtocol());
DeclID typeID = addDeclRef(conf->getType()->getAnyNominal()); DeclID typeID = addDeclRef(conf->getType()->getAnyNominal());