commit 8a798a7f7d88dc9865fad7da648e5cef8580c65a
author Peter Collingbourne <peter@pcc.me.uk> Thu Jul 29 16:12:01 2010 +0000
committer Peter Collingbourne <peter@pcc.me.uk> Thu Jul 29 16:12:01 2010 +0000
tree 992a28e0fb6869eaa3124a98de6fece69a2305a0
parent 9eabebafc165a67812eacc184806e7bf34c5f0a5

Store latest redeclaration for each redeclarable template declaration

This patch adds a Latest field to RedeclarableTemplateDecl's CommonBase
class which is used to store the latest redeclaration.

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

lib/AST/DeclTemplate.cpp

diff --git a/lib/AST/DeclTemplate.cpp b/lib/AST/DeclTemplate.cpp
index de17568..0ca2837 100644
--- a/lib/AST/DeclTemplate.cpp
+++ b/lib/AST/DeclTemplate.cpp
@@ -94,6 +94,7 @@
   if (First->CommonOrPrev.isNull()) {
     CommonBase *CommonPtr = First->newCommon();
     First->CommonOrPrev = CommonPtr;
+    CommonPtr->Latest = First;
   }
   return First->CommonOrPrev.get<CommonBase*>();
 }
@@ -106,6 +107,18 @@
   return Tmpl;
 }
 
+void RedeclarableTemplateDecl::setPreviousDeclarationImpl(
+                                               RedeclarableTemplateDecl *Prev) {
+  if (Prev) {
+    CommonBase *Common = Prev->getCommonPtr();
+    Prev = Common->Latest;
+    Common->Latest = this;
+    CommonOrPrev = Prev;
+  } else {
+    assert(CommonOrPrev.is<CommonBase*>() && "Cannot reset TemplateDecl Prev");
+  }
+}
+
 //===----------------------------------------------------------------------===//
 // FunctionTemplateDecl Implementation
 //===----------------------------------------------------------------------===//

lib/Frontend/PCHReaderDecl.cpp

diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Frontend/PCHReaderDecl.cpp
index 94485d2..03e7e1a 100644
--- a/lib/Frontend/PCHReaderDecl.cpp
+++ b/lib/Frontend/PCHReaderDecl.cpp
@@ -915,6 +915,11 @@
       if (Record[Idx++])
         D->setMemberSpecialization();
     }
+
+    RedeclarableTemplateDecl *LatestDecl = 
+        cast_or_null<RedeclarableTemplateDecl>(Reader.GetDecl(Record[Idx++]));
+    assert(LatestDecl->getKind() == D->getKind() && "Latest kind mismatch");
+    D->getCommonPtr()->Latest = LatestDecl;
   }
 }
 

lib/Frontend/PCHWriterDecl.cpp

diff --git a/lib/Frontend/PCHWriterDecl.cpp b/lib/Frontend/PCHWriterDecl.cpp
index 3ac4958..75045eb 100644
--- a/lib/Frontend/PCHWriterDecl.cpp
+++ b/lib/Frontend/PCHWriterDecl.cpp
@@ -852,6 +852,8 @@
     Writer.AddDeclRef(D->getInstantiatedFromMemberTemplate(), Record);
     if (D->getInstantiatedFromMemberTemplate())
       Record.push_back(D->isMemberSpecialization());
+
+    Writer.AddDeclRef(D->getCommonPtr()->Latest, Record);
   }
 }