1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp
index 04e9993101e..d3592e1416a 100644
--- a/clang/lib/AST/DeclObjC.cpp
+++ b/clang/lib/AST/DeclObjC.cpp
@@ -148,6 +148,8 @@ ObjCPropertyDecl *
     if (property->getIdentifier() == PropertyId)
       return property;
   }
+  if (getSuperClass())
+    return getSuperClass()->FindPropertyDeclaration(PropertyId);
   return 0;
 }
 
@@ -175,6 +177,8 @@ ObjCIvarDecl *
     if (Ivar->getIdentifier() == IvarId)
       return Ivar;
   }
+  if (getSuperClass())
+    return getSuperClass()->FindIvarDeclaration(IvarId);
   return 0;
 }