Move ThisDeclarationWasADefinition to separate map

Author: dmpolukhin

clang/include/clang/Serialization/ASTReader.h

@@ -1390,19 +1390,21 @@ class ASTReader
   /// predefines buffer may contain additional definitions.
   std::string SuggestedPredefines;
 
-  struct DefinitionSourceBits {
-    ExtKind HasExternalDefinitions : 2;
+  llvm::DenseMap<const Decl *, bool> DefinitionSource;
 
+  /// The set of extra flags about declarations that we have read from
+  /// the module file.
+  struct ExternalDeclarationBits {
     /// Indicates if given function declaration was a definition but its body
     /// was removed due to declaration merging.
     bool ThisDeclarationWasADefinition : 1;
 
-    DefinitionSourceBits()
-        : HasExternalDefinitions(EK_ReplyHazy),
-          ThisDeclarationWasADefinition(false) {}
+    ExternalDeclarationBits() : ThisDeclarationWasADefinition(false) {}
   };
 
-  llvm::DenseMap<const Decl *, DefinitionSourceBits> DefinitionSource;
+  /// A mapping from declarations to extra bits of information about this decl.
+  llvm::DenseMap<const Decl *, ExternalDeclarationBits>
+      ExternalDeclarationBitsMap;
 
   bool shouldDisableValidationForFile(const serialization::ModuleFile &M) const;
 

clang/lib/Serialization/ASTReader.cpp

@@ -9657,12 +9657,12 @@ ExternalASTSource::ExtKind ASTReader::hasExternalDefinitions(const Decl *FD) {
   auto I = DefinitionSource.find(FD);
   if (I == DefinitionSource.end())
     return EK_ReplyHazy;
-  return I->second.HasExternalDefinitions;
+  return I->second ? EK_Never : EK_Always;
 }
 
 bool ASTReader::wasThisDeclarationADefinition(const FunctionDecl *FD) {
-  auto I = DefinitionSource.find(FD);
-  if (I == DefinitionSource.end())
+  auto I = ExternalDeclarationBitsMap.find(FD);
+  if (I == ExternalDeclarationBitsMap.end())
     return false;
   return I->second.ThisDeclarationWasADefinition;
 }

clang/lib/Serialization/ASTReaderDecl.cpp

@@ -512,11 +512,9 @@ uint64_t ASTDeclReader::GetCurrentCursorOffset() {
 
 void ASTDeclReader::ReadFunctionDefinition(FunctionDecl *FD) {
   if (Record.readInt()) {
-    Reader.DefinitionSource[FD].HasExternalDefinitions =
-        (Loc.F->Kind == ModuleKind::MK_MainFile ||
-         Reader.getContext().getLangOpts().BuildingPCHWithObjectFile)
-            ? ExternalASTSource::EK_Never
-            : ExternalASTSource::EK_Always;
+    Reader.DefinitionSource[FD] =
+        Loc.F->Kind == ModuleKind::MK_MainFile ||
+        Reader.getContext().getLangOpts().BuildingPCHWithObjectFile;
   }
   if (auto *CD = dyn_cast<CXXConstructorDecl>(FD)) {
     CD->setNumCtorInitializers(Record.readInt());
@@ -527,7 +525,7 @@ void ASTDeclReader::ReadFunctionDefinition(FunctionDecl *FD) {
   Reader.PendingBodies[FD] = GetCurrentCursorOffset();
   // For now remember ThisDeclarationWasADefinition only for friend functions.
   if (FD->getFriendObjectKind())
-    Reader.DefinitionSource[FD].ThisDeclarationWasADefinition = true;
+    Reader.ExternalDeclarationBitsMap[FD].ThisDeclarationWasADefinition = true;
 }
 
 void ASTDeclReader::Visit(Decl *D) {
@@ -1657,11 +1655,9 @@ RedeclarableResult ASTDeclReader::VisitVarDeclImpl(VarDecl *VD) {
     VD->setLocalExternDecl();
 
   if (DefGeneratedInModule) {
-    Reader.DefinitionSource[VD].HasExternalDefinitions =
-        (Loc.F->Kind == ModuleKind::MK_MainFile ||
-         Reader.getContext().getLangOpts().BuildingPCHWithObjectFile)
-            ? ExternalASTSource::EK_Never
-            : ExternalASTSource::EK_Always;
+    Reader.DefinitionSource[VD] =
+        Loc.F->Kind == ModuleKind::MK_MainFile ||
+        Reader.getContext().getLangOpts().BuildingPCHWithObjectFile;
   }
 
   if (VD->hasAttr<BlocksAttr>()) {
@@ -2003,11 +1999,9 @@ void ASTDeclReader::ReadCXXDefinitionData(
   Data.HasODRHash = true;
 
   if (Record.readInt()) {
-    Reader.DefinitionSource[D].HasExternalDefinitions =
-        (Loc.F->Kind == ModuleKind::MK_MainFile ||
-         Reader.getContext().getLangOpts().BuildingPCHWithObjectFile)
-            ? ExternalASTSource::EK_Never
-            : ExternalASTSource::EK_Always;
+    Reader.DefinitionSource[D] =
+        Loc.F->Kind == ModuleKind::MK_MainFile ||
+        Reader.getContext().getLangOpts().BuildingPCHWithObjectFile;
   }
 
   Record.readUnresolvedSet(Data.Conversions);