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

Serialization: Remove mechanism for serializing references to in-memory Decl's AllArchetypes

Browse Source 
I don't see any tests failing with this code removed; I guess
either the duplicate archetype issue no longer occurs, or does
not matter since we use interface types almost everywhere
when talking about Decls from other modules.
This commit is contained in:
Slava Pestov
2016-08-20 00:37:07 -07:00
parent 5568dac631
commit 8d9ad273ba
3 changed files with 5 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/Serialization/Serialization.cpp
View File

@@ -3151,58 +3151,10 @@ void Serializer::writeType(Type ty) {
case TypeKind::BoundGenericEnum:
case TypeKind::BoundGenericStruct: {
auto generic = cast<BoundGenericType>(ty.getPointer());
// We don't want two copies of Archetype being serialized, one by
// serializing genericArgs, the other by serializing the Decl. The reason
// is that it is likely the Decl's Archetype can be serialized in
// a different module, causing two copies being constructed at
// deserialization, one in the other module, one in this module as
// genericArgs. The fix is to check if genericArgs exist in the Decl's
// Archetypes, if they all exist, we use indices to the Decl's
// Archetypes..
bool allGenericArgsInDecl = true;
#ifndef NDEBUG
bool someGenericArgsInDecl = false;
#endif
SmallVector<TypeID, 8> genericArgIDs;
// Push in a special number to say that IDs are indices to the Archetypes.
if (!generic->getGenericArgs().empty())
genericArgIDs.push_back(INT32_MAX);
for (auto next : generic->getGenericArgs()) {
bool found = false;
if (auto arche = dyn_cast<ArchetypeType>(next.getPointer())) {
auto genericParams = generic->getDecl()->getGenericParams();
unsigned idx = 0;
// Check if next exists in the Decl.
for (auto archetype : genericParams->getAllArchetypes()) {
if (archetype == arche) {
found = true;
genericArgIDs.push_back(idx);
#ifndef NDEBUG
someGenericArgsInDecl = true;
#endif
break;
}
idx++;
}
}
if (!found) {
allGenericArgsInDecl = false;
break;
}
}
if (!allGenericArgsInDecl) {
#ifndef NDEBUG
if (someGenericArgsInDecl && isDeclXRef(generic->getDecl()))
// Emit warning message.
llvm::errs() << "Serialization: we may have two copied of Archetype\n";
#endif
genericArgIDs.clear();
for (auto next : generic->getGenericArgs())
genericArgIDs.push_back(addTypeRef(next));
}
for (auto next : generic->getGenericArgs())
genericArgIDs.push_back(addTypeRef(next));
unsigned abbrCode = DeclTypeAbbrCodes[BoundGenericTypeLayout::Code];
BoundGenericTypeLayout::emitRecord(Out, ScratchRecord, abbrCode,