commit ae644896ecccf05b5497a311a8a55112023a0b83
author Douglas Gregor <doug.gregor@gmail.com> Mon Dec 15 16:32:14 2008 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Mon Dec 15 16:32:14 2008 +0000
tree 6043f6cfb34b0d020970b2ca82ced64f3f5b6861
parent 1640bf272e7282e9d3fe366403e7cee2317f33e7

Create new EnumDecl nodes for redeclarations of enums, linking them
together in the same way that we link RecordDecl/CXXRecordDecl nodes. 

Unify ActOnTag and ActOnTagStruct.

Fixes PR clang/2753.


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

lib/AST/ASTContext.cpp

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 1647e75..9f8db59 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -990,7 +990,8 @@
                                  : new RecordType(Record);
   }
   else if (EnumDecl *Enum = dyn_cast<EnumDecl>(Decl))
-    Decl->TypeForDecl = new EnumType(Enum);
+    Decl->TypeForDecl = PrevDecl ? PrevDecl->TypeForDecl
+                                 : new EnumType(Enum);
   else
     assert(false && "TypeDecl without a type?");
 
@@ -998,16 +999,9 @@
   return QualType(Decl->TypeForDecl, 0);
 }
 
-/// setTagDefinition - Used by RecordDecl::completeDefinition and
-/// EnumDecl::completeDefinition to inform about which
-/// RecordDecl/EnumDecl serves as the definition of a particular
-/// struct/union/class/enum.
 void ASTContext::setTagDefinition(TagDecl* D) {
   assert (D->isDefinition());
-  if (!D->TypeForDecl)
-    getTypeDeclType(D);
-  else
-    cast<TagType>(D->TypeForDecl)->decl = D;  
+  cast<TagType>(D->TypeForDecl)->decl = D;  
 }
 
 /// getTypedefType - Return the unique reference to the type for the

lib/AST/Decl.cpp

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 7643e4e..4628761 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -113,9 +113,11 @@
 
 EnumDecl *EnumDecl::Create(ASTContext &C, DeclContext *DC, SourceLocation L,
                            IdentifierInfo *Id,
-                           ScopedDecl *PrevDecl) {
+                           EnumDecl *PrevDecl) {
   void *Mem = C.getAllocator().Allocate<EnumDecl>();
-  return new (Mem) EnumDecl(DC, L, Id, PrevDecl);
+  EnumDecl *Enum = new (Mem) EnumDecl(DC, L, Id, 0);
+  C.getTypeDeclType(Enum, PrevDecl);
+  return Enum;
 }
 
 void EnumDecl::Destroy(ASTContext& C) {