Implement "Destroy" and destructor for ObjCProtocolDecl, allowing us to reclaim its memory and the memory of the Decls it owns.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@52055 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index b3fc131..a0d2818 100644
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -102,6 +102,31 @@
return new (Mem) ObjCProtocolDecl(L, numRefProtos, Id);
}
+ObjCProtocolDecl::~ObjCProtocolDecl() {
+ delete [] ReferencedProtocols;
+ delete [] InstanceMethods;
+ delete [] ClassMethods;
+ delete [] PropertyDecl;
+}
+
+void ObjCProtocolDecl::Destroy(ASTContext& C) {
+
+ // Referenced Protocols are not owned, so don't Destroy them.
+
+ for (instmeth_iterator I=instmeth_begin(), E=instmeth_end(); I!=E; ++I)
+ if (*I) (*I)->Destroy(C);
+
+ for (classmeth_iterator I=classmeth_begin(), E=classmeth_end(); I!=E; ++I)
+ if (*I) (*I)->Destroy(C);
+
+ // FIXME: Because there is no clear ownership
+ // role between ObjCProtocolDecls and the ObjCPropertyDecls that they
+ // reference, we destroy ObjCPropertyDecls in ~TranslationUnit.
+
+ Decl::Destroy(C);
+}
+
+
ObjCClassDecl *ObjCClassDecl::Create(ASTContext &C,
SourceLocation L,
ObjCInterfaceDecl **Elts, unsigned nElts) {
diff --git a/lib/AST/TranslationUnit.cpp b/lib/AST/TranslationUnit.cpp
index e78502f..a683625 100644
--- a/lib/AST/TranslationUnit.cpp
+++ b/lib/AST/TranslationUnit.cpp
@@ -46,11 +46,24 @@
if (ObjCInterfaceDecl* IDecl = dyn_cast<ObjCInterfaceDecl>(*I))
for (ObjCInterfaceDecl::classprop_iterator ID=IDecl->classprop_begin(),
ED=IDecl->classprop_end(); ID!=ED; ++ID) {
- if (Killed.count(*ID)) continue;
+ if (!*ID || Killed.count(*ID)) continue;
Killed.insert(*ID);
(*ID)->Destroy(*Context);
}
+ // FIXME: This is a horrible hack. Because there is no clear ownership
+ // role between ObjCProtocolDecls and the ObjCPropertyDecls that they
+ // reference, we need to destroy ObjCPropertyDecls here. This will
+ // eventually be fixed when the ownership of ObjCPropertyDecls gets
+ // cleaned up.
+ if (ObjCProtocolDecl* PDecl = dyn_cast<ObjCProtocolDecl>(*I))
+ for (ObjCInterfaceDecl::classprop_iterator PD=PDecl->classprop_begin(),
+ ED=PDecl->classprop_end(); PD!=ED; ++PD) {
+ if (!*PD || Killed.count(*PD)) continue;
+ Killed.insert(*PD);
+ (*PD)->Destroy(*Context);
+ }
+
(*I)->Destroy(*Context);
}
}