commit 5fe6d35770459a755bcc1d3861b8508667781244
author Rafael Espindola <rafael.espindola@gmail.com> Tue May 10 14:12:22 2011 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Tue May 10 14:12:22 2011 +0000
tree b6d03d1a590c555301a957bb12f44f1667061c73
parent ec53aa948547dae24e7efa6c604f530c2f13b16a

Revert 131114. This fixes PR9884.

llvm-svn: 131126

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index d3e0cdc..e987cda 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -1508,18 +1508,15 @@
     if (Ctor->isCopyConstructor())
       return Sema::CXXCopyConstructor;
     
-    if (Ctor->isDefaultConstructor())
-      return Sema::CXXDefaultConstructor;
+    return Sema::CXXConstructor;
   } 
   
   if (isa<CXXDestructorDecl>(MD))
     return Sema::CXXDestructor;
   
-  if (MD->isCopyAssignmentOperator())
-    return Sema::CXXCopyAssignment;
-
-  llvm_unreachable("getSpecialMember on non-special member");
-  return Sema::CXXInvalid;
+  assert(MD->isCopyAssignmentOperator() && 
+         "Must have copy assignment operator");
+  return Sema::CXXCopyAssignment;
 }
 
 /// canRedefineFunction - checks if a function can be redefined. Currently,
@@ -7680,7 +7677,7 @@
       if (!RDecl->hasTrivialCopyConstructor())
         member = CXXCopyConstructor;
       else if (!RDecl->hasTrivialDefaultConstructor())
-        member = CXXDefaultConstructor;
+        member = CXXConstructor;
       else if (!RDecl->hasTrivialCopyAssignment())
         member = CXXCopyAssignment;
       else if (!RDecl->hasTrivialDestructor())
@@ -7709,7 +7706,7 @@
   case CXXInvalid:
     break;
 
-  case CXXDefaultConstructor:
+  case CXXConstructor:
     if (RD->hasUserDeclaredConstructor()) {
       typedef CXXRecordDecl::ctor_iterator ctor_iter;
       for (ctor_iter ci = RD->ctor_begin(), ce = RD->ctor_end(); ci != ce;++ci){
@@ -7783,7 +7780,7 @@
 
   bool (CXXRecordDecl::*hasTrivial)() const;
   switch (member) {
-  case CXXDefaultConstructor:
+  case CXXConstructor:
     hasTrivial = &CXXRecordDecl::hasTrivialDefaultConstructor; break;
   case CXXCopyConstructor:
     hasTrivial = &CXXRecordDecl::hasTrivialCopyConstructor; break;

clang/lib/Sema/SemaDeclCXX.cpp

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 81540d3..c502f18 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -5109,7 +5109,7 @@
   if (SetCtorInitializers(Constructor, 0, 0, /*AnyErrors=*/false) ||
       Trap.hasErrorOccurred()) {
     Diag(CurrentLocation, diag::note_member_synthesized_at) 
-      << CXXDefaultConstructor << Context.getTagDeclType(ClassDecl);
+      << CXXConstructor << Context.getTagDeclType(ClassDecl);
     Constructor->setInvalidDecl();
     return;
   }