maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[modules] Remove now-unused MergedLookups map. 

llvm-svn: 244277
This commit is contained in:
Richard Smith 2015-08-06 21:09:44 +00:00
parent 2a2b242f4b
commit 73a7d7d4b8
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/include/clang/Serialization/ASTReader.h
View File

@ -977,13 +977,6 @@ private:
/// module is loaded.
SmallVector<ObjCInterfaceDecl *, 16> ObjCClassesLoaded;
/// \brief A mapping from a primary context for a declaration chain to the
/// other declarations of that entity that also have name lookup tables.
/// Used when we merge together two class definitions that have different
/// sets of declared special member functions.
llvm::DenseMap<const DeclContext*, SmallVector<const DeclContext*, 2>>
MergedLookups;
typedef llvm::DenseMap<Decl *, SmallVector<serialization::DeclID, 2> >
KeyDeclsMap;

20
clang/lib/Serialization/ASTReaderDecl.cpp
View File

@ -1519,15 +1519,6 @@ void ASTDeclReader::MergeDefinitionData(
auto &DD = *D->DefinitionData.getNotUpdated();
if (DD.Definition != MergeDD.Definition) {
// If the new definition has new special members, let the name lookup
// code know that it needs to look in the new definition too.
//
// FIXME: We only need to do this if the merged definition declares members
// that this definition did not declare, or if it defines members that this
// definition did not define.
Reader.MergedLookups[DD.Definition].push_back(MergeDD.Definition);
DD.Definition->setHasExternalVisibleStorage();
// Track that we merged the definitions.
Reader.MergedDeclContexts.insert(std::make_pair(MergeDD.Definition,
DD.Definition));
@ -3731,17 +3722,6 @@ void ASTDeclReader::UpdateDecl(Decl *D, ModuleFile &ModuleFile,
// FIXME: We should call addHiddenDecl instead, to add the member
// to its DeclContext.
RD->addedMember(MD);
// If we've added a new special member to a class definition that is not
// the canonical definition, then we need special member lookups in the
// canonical definition to also look into our class.
auto *DD = RD->DefinitionData.getNotUpdated();
if (DD && DD->Definition != RD) {
auto &Merged = Reader.MergedLookups[DD->Definition];
// FIXME: Avoid the linear-time scan here.
if (std::find(Merged.begin(), Merged.end(), RD) == Merged.end())
Merged.push_back(RD);
}
break;
}