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 pull request #23627 from akyrtzi/fix-bad-deserial-49336277

Browse Source 
[Serialization] Fix bad tagging of deserialized decls that can result in failed member lookups
This commit is contained in:
Argyrios Kyrtzidis
2019-03-28 15:36:42 -07:00
committed by GitHub
parent 9b4bfd8a7a 1b2cb9c723
commit dd40c70496
5 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Serialization/Deserialization.cpp
View File

@@ -3753,35 +3753,35 @@ public:
Expected<Decl *>
ModuleFile::getDeclChecked(DeclID DID) {
// Tag every deserialized ValueDecl coming out of getDeclChecked with its ID.
if (DID == 0)
return nullptr;
assert(DID <= Decls.size() && "invalid decl ID");
auto &declOrOffset = Decls[DID-1];
if (declOrOffset.isComplete())
return declOrOffset;
if (!declOrOffset.isComplete()) {
++NumDeclsLoaded;
BCOffsetRAII restoreOffset(DeclTypeCursor);
DeclTypeCursor.JumpToBit(declOrOffset);
++NumDeclsLoaded;
BCOffsetRAII restoreOffset(DeclTypeCursor);
DeclTypeCursor.JumpToBit(declOrOffset);
ModuleFile::DeserializingEntityRAII deserializingEntity(*this);
Expected<Decl *> deserialized =
DeclDeserializer(*this, declOrOffset).getDeclCheckedImpl();
if (!deserialized)
return deserialized;
}
SWIFT_DEFER {
if (!declOrOffset.isComplete())
return;
if (auto *IDC = dyn_cast_or_null<IterableDeclContext>(declOrOffset.get())) {
// Only set the DeclID on the returned Decl if it's one that was loaded
// and _wasn't_ one that had its DeclID set elsewhere (a followed XREF).
if (IDC->wasDeserialized() &&
static_cast<uint32_t>(IDC->getDeclID()) == 0) {
IDC->setDeclID(DID);
}
// Tag every deserialized ValueDecl coming out of getDeclChecked with its ID.
assert(declOrOffset.isComplete());
if (auto *IDC = dyn_cast_or_null<IterableDeclContext>(declOrOffset.get())) {
// Only set the DeclID on the returned Decl if it's one that was loaded
// and _wasn't_ one that had its DeclID set elsewhere (a followed XREF).
if (IDC->wasDeserialized() &&
static_cast<uint32_t>(IDC->getDeclID()) == 0) {
IDC->setDeclID(DID);
}
};
ModuleFile::DeserializingEntityRAII deserializingEntity(*this);
return DeclDeserializer(*this, declOrOffset).getDeclCheckedImpl();
}
return declOrOffset;
}
llvm::Error DeclDeserializer::deserializeDeclAttributes() {