From: Argyrios Kyrtzidis Date: Tue, 6 Jul 2010 15:37:09 +0000 (+0000) Subject: Read/write function template specializations for PCH, properly this time. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=057d9afdc7e8027f3b928f0dd8d7d921d7cd5615;p=clang Read/write function template specializations for PCH, properly this time. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@107665 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Frontend/PCHReaderDecl.cpp index 698adf49b5..e21cbab589 100644 --- a/lib/Frontend/PCHReaderDecl.cpp +++ b/lib/Frontend/PCHReaderDecl.cpp @@ -977,9 +977,12 @@ void PCHDeclReader::VisitFunctionTemplateDecl(FunctionTemplateDecl *D) { if (PrevDecl == 0) { // This FunctionTemplateDecl owns a CommonPtr; read it. - // FunctionTemplateSpecializationInfos are filled through the - // templated FunctionDecl's setFunctionTemplateSpecialization, no need to - // read them here. + // Read the function specialization declarations. + // FunctionTemplateDecl's FunctionTemplateSpecializationInfos are filled + // through the specialized FunctionDecl's setFunctionTemplateSpecialization. + unsigned NumSpecs = Record[Idx++]; + while (NumSpecs--) + Reader.GetDecl(Record[Idx++]); if (FunctionTemplateDecl *CTD = cast_or_null(Reader.GetDecl(Record[Idx++]))) { diff --git a/lib/Frontend/PCHWriterDecl.cpp b/lib/Frontend/PCHWriterDecl.cpp index 2dc59726ea..7c672bdabb 100644 --- a/lib/Frontend/PCHWriterDecl.cpp +++ b/lib/Frontend/PCHWriterDecl.cpp @@ -923,9 +923,12 @@ void PCHDeclWriter::VisitFunctionTemplateDecl(FunctionTemplateDecl *D) { if (D->getPreviousDeclaration() == 0) { // This FunctionTemplateDecl owns the CommonPtr; write it. - // FunctionTemplateSpecializationInfos are filled through the - // templated FunctionDecl's setFunctionTemplateSpecialization, no need to - // write them here. + // Write the function specialization declarations. + Record.push_back(D->getSpecializations().size()); + for (llvm::FoldingSet::iterator + I = D->getSpecializations().begin(), + E = D->getSpecializations().end() ; I != E; ++I) + Writer.AddDeclRef(I->Function, Record); Writer.AddDeclRef(D->getInstantiatedFromMemberTemplate(), Record); if (D->getInstantiatedFromMemberTemplate())