[cfe-commits] r131574 - /cfe/trunk/lib/Sema/SemaDeclCXX.cpp

[Sean Hunt]

Author: coppro
Date: Wed May 18 15:57:13 2011
New Revision: 131574

URL: http://llvm.org/viewvc/llvm-project?rev=131574&view=rev
Log:
After consultation with doug, revert r131515.

Modified:
    cfe/trunk/lib/Sema/SemaDeclCXX.cpp

Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=131574&r1=131573&r2=131574&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Wed May 18 15:57:13 2011
@@ -2997,12 +2997,6 @@
   //   have inherited constructors.
   DeclareInheritedConstructors(Record);
 
-  // Unfortunately, in C++0x mode, we additionally have to declare all
-  // implicit members in order to ensure we don't get a horrible evil bad
-  // infinite recursion from ShouldDelete*
-  if (getLangOptions().CPlusPlus0x)
-    ForceDeclarationOfImplicitMembers(Record);
-
   CheckExplicitlyDefaultedMethods(Record);
 }
 
@@ -3459,10 +3453,8 @@
 }
 
 bool Sema::ShouldDeleteCopyConstructor(CXXConstructorDecl *CD) {
-  CXXRecordDecl *RD = CD->getParent()->getDefinition();
+  CXXRecordDecl *RD = CD->getParent();
   assert(!RD->isDependentType() && "do deletion after instantiation");
-  assert(RD);
-  assert(CD->getParent() == RD);
   if (!LangOpts.CPlusPlus0x)
     return false;