1 files changed, 14 insertions, 1 deletions
diff --git a/lib/AST/TranslationUnit.cpp b/lib/AST/TranslationUnit.cpp
index e78502f267..a683625789 100644
--- a/lib/AST/TranslationUnit.cpp
+++ b/lib/AST/TranslationUnit.cpp
@@ -46,11 +46,24 @@ TranslationUnit::~TranslationUnit() {
       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);
     }
   }