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-08-06 11:07:55 -07:00
parent 67e4f3d49d b8cb40b950
commit 71f0248b0a
142 changed files with 1358 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Serialization/Serialization.cpp
View File

@@ -1924,9 +1924,9 @@ void Serializer::writeCrossReference(const DeclContext *DC, uint32_t pathLen) {
case DeclContextKind::ExtensionDecl: {
auto ext = cast<ExtensionDecl>(DC);
Type baseTy = ext->getExtendedType();
assert(!baseTy->hasUnboundGenericType());
writeCrossReference(baseTy->getAnyNominal(), pathLen + 1);
auto nominal = ext->getExtendedNominal();
assert(nominal);
writeCrossReference(nominal, pathLen + 1);
abbrCode = DeclTypeAbbrCodes[XRefExtensionPathPieceLayout::Code];
CanGenericSignature genericSig(nullptr);
@@ -4902,9 +4902,7 @@ void Serializer::writeAST(ModuleOrSourceFile DC,
topLevelDecls[VD->getBaseName()]
.push_back({ getKindForTable(D), addDeclRef(D) });
} else if (auto ED = dyn_cast<ExtensionDecl>(D)) {
Type extendedTy = ED->getExtendedType();
assert(!extendedTy->hasUnboundGenericType());
const NominalTypeDecl *extendedNominal = extendedTy->getAnyNominal();
const NominalTypeDecl *extendedNominal = ED->getExtendedNominal();
extensionDecls[extendedNominal->getName()]
.push_back({ extendedNominal, addDeclRef(D) });
} else if (auto OD = dyn_cast<OperatorDecl>(D)) {