AST: Set ClassDecl's HasDestructor bit in one place

Author: slavapestov

lib/AST/Decl.cpp

@@ -3547,7 +3547,6 @@ void ClassDecl::addImplicitDestructor() {
   // Create an empty body for the destructor.
   DD->setBody(BraceStmt::create(ctx, getLoc(), { }, getLoc(), true));
   addMember(DD);
-  setHasDestructor();
 
   // Propagate access control and versioned-ness.
   DD->copyFormalAccessFrom(this, /*sourceIsParentContext*/true);

lib/AST/NameLookup.cpp

@@ -1437,6 +1437,11 @@ void MemberLookupTable::updateLookupTable(NominalTypeDecl *nominal) {
 }
 
 void NominalTypeDecl::addedMember(Decl *member) {
+  // Remember if we added a destructor.
+  if (auto *CD = dyn_cast<ClassDecl>(this))
+    if (isa<DestructorDecl>(member))
+      CD->setHasDestructor();
+
   // If we have a lookup table, add the new member to it.
   if (LookupTable.getPointer()) {
     LookupTable.getPointer()->addMember(member);

lib/Parse/ParseDecl.cpp

@@ -3050,8 +3050,6 @@ void Parser::parseDeclListDelayed(IterableDeclContext *IDC) {
   } else if (auto *cd = dyn_cast<ClassDecl>(D)) {
     auto handler = [&] (Decl *D) {
       cd->addMember(D);
-      if (isa<DestructorDecl>(D))
-        cd->setHasDestructor();
     };
     parseDeclList(cd->getBraces().Start, RBLoc, Id,
                   ParseDeclOptions(DelayedState->Flags), handler);
@@ -6160,8 +6158,6 @@ ParserResult<ClassDecl> Parser::parseDeclClass(ParseDeclOptions Flags,
     } else {
       auto Handler = [&] (Decl *D) {
         CD->addMember(D);
-        if (isa<DestructorDecl>(D))
-          CD->setHasDestructor();
       };
       if (parseDeclList(LBLoc, RBLoc, diag::expected_rbrace_class,
                         Options, Handler))