diff options
| -rw-r--r-- | lib/AST/DeclObjC.cpp | 12 | ||||
| -rw-r--r-- | lib/AST/TranslationUnit.cpp | 14 |
2 files changed, 19 insertions, 7 deletions
diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp index f3d81a1aa5..b3fc131330 100644 --- a/lib/AST/DeclObjC.cpp +++ b/lib/AST/DeclObjC.cpp @@ -79,13 +79,11 @@ void ObjCInterfaceDecl::Destroy(ASTContext& C) { for (classmeth_iterator I=classmeth_begin(), E=classmeth_end(); I!=E; ++I) if (*I) (*I)->Destroy(C); - - // FIXME: Cannot destroy properties right now because the properties of - // both the super class and this class are in this array. This can - // cause double-deletions. - //for (classprop_iterator I=classprop_begin(), E=classprop_end(); I!=E; ++I) -// if (*I) (*I)->Destroy(C); -// + + // FIXME: Because there is no clear ownership + // role between ObjCInterfaceDecls and the ObjCPropertyDecls that they + // reference, we destroy ObjCPropertyDecls in ~TranslationUnit. + Decl::Destroy(C); } diff --git a/lib/AST/TranslationUnit.cpp b/lib/AST/TranslationUnit.cpp index f8416f18fa..e78502f267 100644 --- a/lib/AST/TranslationUnit.cpp +++ b/lib/AST/TranslationUnit.cpp @@ -37,6 +37,20 @@ TranslationUnit::~TranslationUnit() { if (Killed.count(*I)) continue; Killed.insert(*I); + + // FIXME: This is a horrible hack. Because there is no clear ownership + // role between ObjCInterfaceDecls 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 (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; + Killed.insert(*ID); + (*ID)->Destroy(*Context); + } + (*I)->Destroy(*Context); } } |