commit 9e7d9de3ef538c1473248238b76a6d7b16f5f684
author Douglas Gregor <dgregor@apple.com> Mon Dec 15 21:24:18 2008 +0000
committer Douglas Gregor <dgregor@apple.com> Mon Dec 15 21:24:18 2008 +0000
tree 272828d09e3dd9dfbcbd05538158ee64fa7312fe
parent 9fed5169477cfca54e97069bca035f6453b1ab84

Place constructors and destructors into the DeclContext of the class,
just like all other members, and remove the special variables in
CXXRecordDecl to store them. This eliminates a lot of special-case
code for constructors and destructors, including
ActOnConstructor/ActOnDeclarator and special lookup rules in
LookupDecl. The result is far more uniform and manageable.

Diagnose the redeclaration of member functions.


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

lib/AST/DeclCXX.cpp

diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index 3eaf301..12d715e 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -40,9 +40,8 @@
                              SourceLocation L, IdentifierInfo *Id) 
   : RecordDecl(CXXRecord, TK, DC, L, Id),
     UserDeclaredConstructor(false), UserDeclaredCopyConstructor(false),
-    Aggregate(true), Polymorphic(false), Bases(0), NumBases(0),
-    Constructors(DC, DeclarationName()),
-    Destructor(0), 
+    UserDeclaredDestructor(false), Aggregate(true), Polymorphic(false), 
+    Bases(0), NumBases(0),
     Conversions(DC, DeclarationName()) { }
 
 CXXRecordDecl *CXXRecordDecl::Create(ASTContext &C, TagKind TK, DeclContext *DC,
@@ -58,18 +57,6 @@
   delete [] Bases;
 }
 
-void CXXRecordDecl::Destroy(ASTContext &C) {
-  for (OverloadedFunctionDecl::function_iterator func 
-         = Constructors.function_begin();
-       func != Constructors.function_end(); ++func)
-    (*func)->Destroy(C);
-
-  if (isDefinition())
-    Destructor->Destroy(C);
-
-  RecordDecl::Destroy(C);
-}
-
 void 
 CXXRecordDecl::setBases(CXXBaseSpecifier const * const *Bases, 
                         unsigned NumBases) {
@@ -88,20 +75,35 @@
 }
 
 bool CXXRecordDecl::hasConstCopyConstructor(ASTContext &Context) const {
-  for (OverloadedFunctionDecl::function_const_iterator Con 
-         = Constructors.function_begin();
-       Con != Constructors.function_end(); ++Con) {
-    unsigned TypeQuals;
+  QualType ClassType = Context.getTypeDeclType(const_cast<CXXRecordDecl*>(this));
+  DeclarationName ConstructorName 
+    = Context.DeclarationNames.getCXXConstructorName(
+                                           Context.getCanonicalType(ClassType));
+  unsigned TypeQuals;
+  DeclContext::lookup_const_result Lookup 
+    = this->lookup(Context, ConstructorName);
+  if (Lookup.first == Lookup.second)
+    return false;
+  else if (OverloadedFunctionDecl *Constructors             
+             = dyn_cast<OverloadedFunctionDecl>(*Lookup.first)) {
+    for (OverloadedFunctionDecl::function_const_iterator Con 
+           = Constructors->function_begin();
+         Con != Constructors->function_end(); ++Con) {
     if (cast<CXXConstructorDecl>(*Con)->isCopyConstructor(Context, TypeQuals) &&
         (TypeQuals & QualType::Const != 0))
       return true;
+    }
+  } else if (CXXConstructorDecl *Constructor 
+               = dyn_cast<CXXConstructorDecl>(*Lookup.first)) {
+    return Constructor->isCopyConstructor(Context, TypeQuals) &&
+           (TypeQuals & QualType::Const != 0);
   }
   return false;
 }
 
 void 
-CXXRecordDecl::addConstructor(ASTContext &Context, 
-                              CXXConstructorDecl *ConDecl) {
+CXXRecordDecl::addedConstructor(ASTContext &Context, 
+                                CXXConstructorDecl *ConDecl) {
   if (!ConDecl->isImplicitlyDeclared()) {
     // Note that we have a user-declared constructor.
     UserDeclaredConstructor = true;
@@ -116,8 +118,6 @@
     if (ConDecl->isCopyConstructor(Context))
       UserDeclaredCopyConstructor = true;
   }
-
-  Constructors.addOverload(ConDecl);
 }
 
 void CXXRecordDecl::addConversionFunction(ASTContext &Context,