1 files changed, 2 insertions, 11 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index f698620543f..063e0ec314d 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -2099,17 +2099,8 @@ Sema::ActOnMemberReferenceExpr(Scope *S, ExprArg Base, SourceLocation OpLoc,
       QualType ResTy = PD->getType();
       Selector Sel = PP.getSelectorTable().getNullarySelector(&Member);
       ObjCMethodDecl *Getter = IFace->lookupInstanceMethod(Context, Sel);
-      if (Getter) {
-        AssignConvertType result =
-          CheckAssignmentConstraints(PD->getType(), Getter->getResultType());
-        if (result != Compatible) {
-          Diag(MemberLoc, diag::warn_accessor_property_type_mismatch) 
-            << PD->getDeclName() << Sel;
-          Diag(Getter->getLocation(), diag::note_declared_at);
-          ResTy = Getter->getResultType();
-        }
-      }
-      
+      if (DiagnosePropertyAccessorMismatch(PD, Getter, MemberLoc))
+        ResTy = Getter->getResultType();
       return Owned(new (Context) ObjCPropertyRefExpr(PD, ResTy,
                                                      MemberLoc, BaseExpr));
     }