When writing a PCH file, keep track of all of the non-static,

non-inline external definitions (and tentative definitions) that are
found at the top level. The corresponding declarations are stored in a
record in the PCH file, so that they can be provided to the
ASTConsumer (via HandleTopLevelDecl) when the PCH file is read.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69005 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 25 insertions, 2 deletions

diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp
index 738e5c1879..c7bfa0b74e 100644
--- a/lib/Frontend/PCHWriter.cpp
+++ b/lib/Frontend/PCHWriter.cpp
@@ -934,8 +934,29 @@ void PCHWriter::WriteDeclsBlock(ASTContext &Context) {
     W.Code = (pch::DeclCode)0;
     W.Visit(D);
     if (DC) W.VisitDeclContext(DC, LexicalOffset, VisibleOffset);
-    assert(W.Code && "Visitor did not set record code");
+    assert(W.Code && "Unhandled declaration kind while generating PCH");
     S.EmitRecord(W.Code, Record);
+
+    // Note external declarations so that we can add them to a record
+    // in the PCH file later.
+    if (isa<FileScopeAsmDecl>(D))
+      ExternalDefinitions.push_back(ID);
+    else if (VarDecl *Var = dyn_cast<VarDecl>(D)) {
+      if (// Non-static file-scope variables with initializers or that
+          // are tentative definitions.
+          (Var->isFileVarDecl() &&
+           (Var->getInit() || Var->getStorageClass() == VarDecl::None)) ||
+          // Out-of-line definitions of static data members (C++).
+          (Var->getDeclContext()->isRecord() && 
+           !Var->getLexicalDeclContext()->isRecord() && 
+           Var->getStorageClass() == VarDecl::Static))
+        ExternalDefinitions.push_back(ID);
+    } else if (FunctionDecl *Func = dyn_cast<FunctionDecl>(D)) {
+      if (Func->isThisDeclarationADefinition() &&
+          Func->getStorageClass() != FunctionDecl::Static &&
+          !Func->isInline())
+        ExternalDefinitions.push_back(ID);
+    }
   }
 
   // Exit the declarations block
@@ -1013,9 +1034,11 @@ void PCHWriter::WritePCH(ASTContext &Context, const Preprocessor &PP) {
   WritePreprocessor(PP);
   WriteTypesBlock(Context);
   WriteDeclsBlock(Context);
+  WriteIdentifierTable();
   S.EmitRecord(pch::TYPE_OFFSET, TypeOffsets);
   S.EmitRecord(pch::DECL_OFFSET, DeclOffsets);
-  WriteIdentifierTable();
+  if (!ExternalDefinitions.empty())
+    S.EmitRecord(pch::EXTERNAL_DEFINITIONS, ExternalDefinitions);
   S.ExitBlock();
 }