commit eef00293897a73cc47f4d42e2653ff47c59d6030
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Aug 06 02:25:10 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Aug 06 02:25:10 2012 +0000
tree f692e2ead307b2f1360a51537a25b7716cc86a76
parent a841c19f7860393d6319bf40e9d662284462771d

PR13527: don't assert if a function is explicitly defaulted when it's already
been defined.


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

lib/Sema/SemaDeclCXX.cpp

diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 8cd134a..9933bd1 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -4552,7 +4552,8 @@
 /// C++11 [class.copy]p23, and C++11 [class.dtor]p5.
 bool Sema::ShouldDeleteSpecialMember(CXXMethodDecl *MD, CXXSpecialMember CSM,
                                      bool Diagnose) {
-  assert(!MD->isInvalidDecl());
+  if (MD->isInvalidDecl())
+    return false;
   CXXRecordDecl *RD = MD->getParent();
   assert(!RD->isDependentType() && "do deletion after instantiation");
   if (!LangOpts.CPlusPlus0x || RD->isInvalidDecl())