diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index bf1e58c..5d9a09d 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -278,9 +278,9 @@
       // declared it.
       else if (Constructor->isCopyConstructor())
         data().DeclaredCopyConstructor = true;
-    }
-    // FIXME: Destructors
-    else if (CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(D)) {
+    } else if (isa<CXXDestructorDecl>(D)) {
+      data().DeclaredDestructor = true;
+    } else if (CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(D)) {
       // If this is the implicit copy constructor, note that we have now
       // declared it.
       // FIXME: Move constructors
@@ -330,8 +330,14 @@
     return;
   }
 
-  // FIXME: Destructors.
+  // Handle (user-declared) destructors.
+  if (isa<CXXDestructorDecl>(D)) {
+    data().DeclaredDestructor = true;
+    data().UserDeclaredDestructor = true;
+    return;
+  }
   
+  // Handle (user-declared) member functions.
   if (CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(D)) {
     if (Method->getOverloadedOperator() == OO_Equal) {
       // We're interested specifically in copy assignment operators.