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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2018-04-05 09:29:49 -07:00
parent 3c18eed986 9793439356
commit 8f0f89053a
11 changed files with 217 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/Serialization.cpp
View File

@@ -1614,7 +1614,9 @@ Serializer::writeConformance(ProtocolConformanceRef conformanceRef,
switch (conformance->getKind()) {
case ProtocolConformanceKind::Normal: {
auto normal = cast<NormalProtocolConformance>(conformance);
if (!isDeclXRef(getDeclForContext(normal->getDeclContext()))) {
if (!isDeclXRef(getDeclForContext(normal->getDeclContext()))
&& !isa<ClangModuleUnit>(normal->getDeclContext()
->getModuleScopeContext())) {
// A normal conformance in this module file.
unsigned abbrCode = abbrCodes[NormalProtocolConformanceIdLayout::Code];
NormalProtocolConformanceIdLayout::emitRecord(Out, ScratchRecord,