commit f716bb859bbf05e3921ec3297013c52936adf662
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 750dd18e9ba850046de0aec2ea79c40fac7b7fdc
parent 3cd1bcb358891767db4fd8b7e912eb9b00417dc8

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

llvm-svn: 161315

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index eb5b0cd..c1086fb 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -7483,6 +7483,7 @@
     else
       Diag(FD->getLocation(), diag::err_redefinition) << FD->getDeclName();
     Diag(Definition->getLocation(), diag::note_previous_definition);
+    FD->setInvalidDecl();
   }
 }
 

clang/lib/Sema/SemaDeclCXX.cpp

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 8cd134a..9933bd1 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/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())