Better support destructors in objcImpl

Author: beccadax

lib/AST/Decl.cpp

@@ -5361,8 +5361,10 @@ synthesizeEmptyFunctionBody(AbstractFunctionDecl *afd, void *context) {
 
 DestructorDecl *
 GetDestructorRequest::evaluate(Evaluator &evaluator, ClassDecl *CD) const {
+  auto dc = CD->getImplementationContext();
+
   auto &ctx = CD->getASTContext();
-  auto *DD = new (ctx) DestructorDecl(CD->getLoc(), CD);
+  auto *DD = new (ctx) DestructorDecl(CD->getLoc(), dc->getAsGenericContext());
 
   DD->setImplicit();
 

lib/AST/NameLookupRequests.cpp

@@ -219,7 +219,7 @@ Optional<DestructorDecl *> GetDestructorRequest::getCachedResult() const {
 
 void GetDestructorRequest::cacheResult(DestructorDecl *value) const {
   auto *classDecl = std::get<0>(getStorage());
-  classDecl->addMember(value);
+  classDecl->getImplementationContext()->addMember(value);
 }
 
 //----------------------------------------------------------------------------//

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -1236,7 +1236,7 @@ static void checkDynamicSelfType(ValueDecl *decl, Type type) {
 /// checking whether it shadows an imported declaration).
 static void checkObjCImplementationMemberAvoidsVTable(ValueDecl *VD) {
   // We check the properties instead of their accessors.
-  if (isa<AccessorDecl>(VD))
+  if (isa<AccessorDecl>(VD) || isa<DestructorDecl>(member))
     return;
 
   // Are we in an @_objcImplementation extension?
@@ -3744,7 +3744,8 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     // Only check again for destructor decl outside of a class if our destructor
     // is not marked as invalid.
     if (!DD->isInvalid()) {
-      auto *nom = dyn_cast<NominalTypeDecl>(DD->getDeclContext());
+      auto *nom = dyn_cast<NominalTypeDecl>(
+                             DD->getDeclContext()->getImplementedObjCContext());
       if (!nom || (!isa<ClassDecl>(nom) && !nom->isMoveOnly())) {
         DD->diagnose(diag::destructor_decl_outside_class_or_noncopyable);
       }

lib/Serialization/Deserialization.cpp

@@ -4657,8 +4657,8 @@ class DeclDeserializer {
 
     dtor->setGenericSignature(MF.getGenericSignature(genericSigID));
 
-    dtor->setAccess(std::max(cast<NominalTypeDecl>(DC)->getFormalAccess(),
-                             AccessLevel::Internal));
+    auto *nom = cast<NominalTypeDecl>(DC->getImplementedObjCContext());
+    dtor->setAccess(std::max(nom->getFormalAccess(), AccessLevel::Internal));
 
     if (isImplicit)
       dtor->setImplicit();