From 6a4a210126264ad0f947c4ca5361e8530bf4e877 Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Tue, 1 Sep 2015 13:24:39 +0000 Subject: Reverting r246497 (which requires also reverting r246524 and r246521 to avoid merge conflicts). It broke the build on MSVC 2015. It also broke an MSVC 2013 bot with testing issues. llvm\tools\clang\lib\serialization\MultiOnDiskHashTable.h(117): error C2065: 'Files': undeclared identifier http://bb.pgr.jp/builders/ninja-clang-i686-msc18-R/builds/2917 llvm-svn: 246546 --- clang/lib/Serialization/ASTReaderDecl.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'clang/lib/Serialization/ASTReaderDecl.cpp') diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index 2677592465d..25a684a531e 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -1489,8 +1489,6 @@ void ASTDeclReader::MergeDefinitionData( Reader.PendingDefinitions.erase(MergeDD.Definition); MergeDD.Definition->IsCompleteDefinition = false; mergeDefinitionVisibility(DD.Definition, MergeDD.Definition); - assert(Reader.Lookups.find(MergeDD.Definition) == Reader.Lookups.end() && - "already loaded pending lookups for merged definition"); } auto PFDI = Reader.PendingFakeDefinitionData.find(&DD); @@ -3348,10 +3346,15 @@ void ASTReader::loadDeclUpdateRecords(serialization::DeclID ID, Decl *D) { PendingVisibleUpdates.erase(I); auto *DC = cast(D)->getPrimaryContext(); - for (const PendingVisibleUpdate &Update : VisibleUpdates) - Lookups[DC].Table.add( - Update.Mod, Update.Data, + for (const PendingVisibleUpdate &Update : VisibleUpdates) { + auto *&LookupTable = Update.Mod->DeclContextInfos[DC].NameLookupTableData; + assert(!LookupTable && "multiple lookup tables for DC in module"); + LookupTable = reader::ASTDeclContextNameLookupTable::Create( + Update.Data + Update.BucketOffset, + Update.Data + sizeof(uint32_t), + Update.Data, reader::ASTDeclContextNameLookupTrait(*this, *Update.Mod)); + } DC->setHasExternalVisibleStorage(true); } -- cgit v1.2.3