Patch to diagnose inconsistancies between properties declared in current and

its super class. This patch is incomplete.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@50228 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Parse/Action.h b/include/clang/Parse/Action.h
index de25ece901fa1da6c408f1b25e6cf6f257961548..75d06e3b9208f8186465522b6678f75d9be6dbe6 100644 (file)
--- a/include/clang/Parse/Action.h
+++ b/include/clang/Parse/Action.h
@@ -718,8 +718,14 @@ public:
                                        llvm::SmallVector<DeclTy *, 8> &
                                        Protocols) {
   }
-                                               
-                                               
+
+  /// ComparePropertiesInBaseAndSuper - This routine compares property
+  /// declarations in base and its super class, if any, and issues
+  /// diagnostics in a variety of inconsistant situations.
+  ///
+  virtual void ComparePropertiesInBaseAndSuper(SourceLocation *PropertyLoc,
+                                               DeclTy *ClassInterface) {
+  }
   //===----------------------- Obj-C Expressions --------------------------===//
 
   virtual ExprResult ParseObjCStringLiteral(SourceLocation *AtLocs, 

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index da878f3f13b02faa7fe4d95cc917014308799cf0..4b6722abc643767d165bba6afdee848ea562e919 100644 (file)
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -652,6 +652,9 @@ public:
                                        llvm::SmallVector<DeclTy *, 8> & 
                                        Protocols);
 
+  virtual void ComparePropertiesInBaseAndSuper(SourceLocation *PropertyLoc,
+                                               DeclTy *ClassInterface);
+  
   virtual void ActOnAtEnd(SourceLocation AtEndLoc, DeclTy *classDecl,
                       DeclTy **allMethods = 0, unsigned allNum = 0,
                       DeclTy **allProperties = 0, unsigned pNum = 0);

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 61449fc4579ac11559fe924aa707e330b2e832cb..63c1350743ce68423744fbe07b8c6ebd1babcac4 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -246,6 +246,74 @@ Sema::FindProtocolDeclaration(SourceLocation TypeLoc,
   }
 }
 
+/// DiagnosePropertyMismatch - Compares two properties for their
+/// attributes and types and warns on a variety of inconsistancies.
+///
+// TODO: Incomplete. 
+//
+static void
+DiagnosePropertyMismatch(ObjCPropertyDecl *Property, 
+                         ObjCPropertyDecl *SuperProperty) {
+  ObjCPropertyDecl::PropertyAttributeKind CAttr = 
+  Property->getPropertyAttributes();
+  ObjCPropertyDecl::PropertyAttributeKind SAttr = 
+  SuperProperty->getPropertyAttributes();
+  if ((CAttr & ObjCPropertyDecl::OBJC_PR_readonly)
+      && (SAttr & ObjCPropertyDecl::OBJC_PR_readwrite))
+    ; // ???
+  
+  if ((CAttr & ObjCPropertyDecl::OBJC_PR_copy)
+      != (SAttr & ObjCPropertyDecl::OBJC_PR_copy))
+    ; //
+  else if ((CAttr & ObjCPropertyDecl::OBJC_PR_retain)
+           != (SAttr & ObjCPropertyDecl::OBJC_PR_retain))
+    ; // ???
+  
+  if ((CAttr & ObjCPropertyDecl::OBJC_PR_nonatomic)
+      != (SAttr & ObjCPropertyDecl::OBJC_PR_nonatomic))
+    ; //
+  
+  if (Property->getSetterName() != SuperProperty->getSetterName())
+    ; //
+  if (Property->getGetterName() != SuperProperty->getGetterName())
+    ; //
+  
+  if (Property->getCanonicalType() != SuperProperty->getCanonicalType()) {
+    if ((CAttr & ObjCPropertyDecl::OBJC_PR_readonly)
+        && (SAttr & ObjCPropertyDecl::OBJC_PR_readonly))
+       // && objc_compare_types(...))
+      ;
+    else
+      ; //
+  }
+  
+}
+
+/// ComparePropertiesInBaseAndSuper - This routine compares property
+/// declarations in base and its super class, if any, and issues
+/// diagnostics in a variety of inconsistant situations.
+///
+void 
+Sema::ComparePropertiesInBaseAndSuper(SourceLocation *PropertyLoc,
+                                      DeclTy *D) {
+  ObjCInterfaceDecl *IDecl = 
+    dyn_cast<ObjCInterfaceDecl>(static_cast<Decl *>(D));
+  ObjCInterfaceDecl *SDecl = IDecl->getSuperClass();
+  if (!SDecl)
+    return;
+  for (ObjCInterfaceDecl::classprop_iterator I = SDecl->classprop_begin(),
+       E = SDecl->classprop_end(); I != E; ++I) {
+    ObjCPropertyDecl *SuperPDecl = (*I);
+    // Does property in super class has declaration in current class?
+    for (ObjCInterfaceDecl::classprop_iterator I = IDecl->classprop_begin(),
+         E = IDecl->classprop_end(); I != E; ++I) {
+      ObjCPropertyDecl *PDecl = (*I);
+      if (SuperPDecl->getIdentifier() == PDecl->getIdentifier())
+          DiagnosePropertyMismatch(PDecl, SuperPDecl);
+    }
+  }
+}
+
 /// ActOnForwardProtocolDeclaration - 
 Action::DeclTy *
 Sema::ActOnForwardProtocolDeclaration(SourceLocation AtProtocolLoc,