AST writer support for having specializations of templates from earlier in the chain. This ought to finish C++ chained PCH support.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@111986 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Serialization/ASTWriter.h b/include/clang/Serialization/ASTWriter.h
index 6bdba09..b8bff27 100644
--- a/include/clang/Serialization/ASTWriter.h
+++ b/include/clang/Serialization/ASTWriter.h
@@ -217,6 +217,16 @@
llvm::SmallVector<std::pair<serialization::DeclID, uint64_t>, 16>
ReplacedDecls;
+ typedef llvm::SmallVector<serialization::DeclID, 4>
+ AdditionalTemplateSpecializationsList;
+ typedef llvm::DenseMap<serialization::DeclID,
+ AdditionalTemplateSpecializationsList>
+ AdditionalTemplateSpecializationsMap;
+
+ /// \brief Additional specializations (including partial) of templates that
+ /// were introduced after the template was serialized.
+ AdditionalTemplateSpecializationsMap AdditionalTemplateSpecializations;
+
/// \brief Statements that we've encountered while serializing a
/// declaration or type.
llvm::SmallVector<Stmt *, 16> StmtsToEmit;
@@ -266,6 +276,7 @@
void WriteAttributeRecord(const AttrVec &Attrs);
void WriteDeclUpdateBlock();
void WriteDeclContextVisibleUpdate(const DeclContext *DC);
+ void WriteAdditionalTemplateSpecializations();
unsigned ParmVarDeclAbbrev;
unsigned DeclContextLexicalAbbrev;
@@ -420,6 +431,13 @@
UpdatedNamespaces.insert(NS);
}
+ /// \brief Record a template specialization or partial specialization of
+ /// a template from a previous PCH file.
+ void AddAdditionalTemplateSpecialization(serialization::DeclID Templ,
+ serialization::DeclID Spec) {
+ AdditionalTemplateSpecializations[Templ].push_back(Spec);
+ }
+
/// \brief Note that the identifier II occurs at the given offset
/// within the identifier table.
void SetIdentifierOffset(const IdentifierInfo *II, uint32_t Offset);
diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp
index 5c3e24a..be181f4 100644
--- a/lib/Serialization/ASTWriter.cpp
+++ b/lib/Serialization/ASTWriter.cpp
@@ -2129,6 +2129,21 @@
Stream.EmitRecordWithBlob(UpdateVisibleAbbrev, Record, LookupTable.str());
}
+/// \brief Write ADDITIONAL_TEMPLATE_SPECIALIZATIONS blocks for all templates
+/// that have new specializations in the current AST file.
+void ASTWriter::WriteAdditionalTemplateSpecializations() {
+ RecordData Record;
+ for (AdditionalTemplateSpecializationsMap::iterator
+ I = AdditionalTemplateSpecializations.begin(),
+ E = AdditionalTemplateSpecializations.end();
+ I != E; ++I) {
+ Record.clear();
+ Record.push_back(I->first);
+ Record.insert(Record.end(), I->second.begin(), I->second.end());
+ Stream.EmitRecord(ADDITIONAL_TEMPLATE_SPECIALIZATIONS, Record);
+ }
+}
+
//===----------------------------------------------------------------------===//
// General Serialization Routines
//===----------------------------------------------------------------------===//
@@ -2638,6 +2653,10 @@
I != E; ++I)
WriteDeclContextVisibleUpdate(*I);
+ // Write the updates to C++ template specialization lists.
+ if (!AdditionalTemplateSpecializations.empty())
+ WriteAdditionalTemplateSpecializations();
+
Record.clear();
Record.push_back(NumStatements);
Record.push_back(NumMacros);
diff --git a/lib/Serialization/ASTWriterDecl.cpp b/lib/Serialization/ASTWriterDecl.cpp
index 3edb630..413f544 100644
--- a/lib/Serialization/ASTWriterDecl.cpp
+++ b/lib/Serialization/ASTWriterDecl.cpp
@@ -888,13 +888,21 @@
llvm::PointerUnion<ClassTemplateDecl *,
ClassTemplatePartialSpecializationDecl *> InstFrom
= D->getSpecializedTemplateOrPartial();
+ Decl *InstFromD;
if (InstFrom.is<ClassTemplateDecl *>()) {
- Writer.AddDeclRef(InstFrom.get<ClassTemplateDecl *>(), Record);
+ InstFromD = InstFrom.get<ClassTemplateDecl *>();
+ Writer.AddDeclRef(InstFromD, Record);
} else {
- Writer.AddDeclRef(InstFrom.get<ClassTemplatePartialSpecializationDecl *>(),
- Record);
+ InstFromD = InstFrom.get<ClassTemplatePartialSpecializationDecl *>();
+ Writer.AddDeclRef(InstFromD, Record);
Writer.AddTemplateArgumentList(&D->getTemplateInstantiationArgs(), Record);
+ InstFromD = cast<ClassTemplatePartialSpecializationDecl>(InstFromD)->
+ getSpecializedTemplate();
}
+ // Is this a specialization of an already-serialized template?
+ if (InstFromD->getCanonicalDecl()->getPCHLevel() != 0)
+ Writer.AddAdditionalTemplateSpecialization(Writer.getDeclID(InstFromD),
+ Writer.getDeclID(D));
// Explicit info.
Writer.AddTypeSourceInfo(D->getTypeAsWritten(), Record);
diff --git a/test/PCH/Inputs/chain-cxx1.h b/test/PCH/Inputs/chain-cxx1.h
index 747bdbc..7ea3ffb 100644
--- a/test/PCH/Inputs/chain-cxx1.h
+++ b/test/PCH/Inputs/chain-cxx1.h
@@ -12,4 +12,8 @@
}
template <typename T>
-struct S {};
+struct S { typedef int G; };
+
+// Partially specialize
+template <typename T>
+struct S<T *> { typedef int H; };
diff --git a/test/PCH/Inputs/chain-cxx2.h b/test/PCH/Inputs/chain-cxx2.h
index ff22e53..adc10fd 100644
--- a/test/PCH/Inputs/chain-cxx2.h
+++ b/test/PCH/Inputs/chain-cxx2.h
@@ -18,3 +18,15 @@
// Specialize template from primary
template <>
struct S<int> { typedef int I; };
+
+// Partially specialize
+template <typename T>
+struct S<T &> { typedef int J; };
+
+// Specialize previous partial specialization
+template <>
+struct S<int *> { typedef int K; };
+
+// Specialize the partial specialization from this file
+template <>
+struct S<int &> { typedef int L; };
diff --git a/test/PCH/chain-cxx.cpp b/test/PCH/chain-cxx.cpp
index 450a791..3e46214 100644
--- a/test/PCH/chain-cxx.cpp
+++ b/test/PCH/chain-cxx.cpp
@@ -19,5 +19,10 @@
ns::pg();
ns::g2();
- //typedef S<int>::I J;
+ typedef S<double>::G T1;
+ typedef S<double *>::H T2;
+ typedef S<int>::I T3;
+ typedef S<double &>::J T4;
+ typedef S<int *>::K T5;
+ typedef S<int &>::L T6;
}