diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 4aea4f8f9452..ff6388bd1a30 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -1808,11 +1808,11 @@ llvm::DIType *CGDebugInfo::CreateTypeDefinition(const ObjCInterfaceType *Ty,
   };
   {
     llvm::SmallPtrSet<const IdentifierInfo*, 16> PropertySet;
-    //for (const ObjCCategoryDecl *ClassExt : ID->known_extensions())
-    //  for (auto *PD : ClassExt->properties()) {
-    //    PropertySet.insert(PD->getIdentifier());
-    //    AddProperty(PD);
-    //  }
+    for (const ObjCCategoryDecl *ClassExt : ID->known_extensions())
+      for (auto *PD : ClassExt->properties()) {
+        PropertySet.insert(PD->getIdentifier());
+        AddProperty(PD);
+      }
     for (const auto *PD : ID->properties()) {
       // Don't emit duplicate metadata for properties that were already in a
       // class extension.