1 files changed, 14 insertions, 0 deletions
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);
     }
   }