Refactoring of my last patch.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71248 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index f698620..063e0ec 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -2099,17 +2099,8 @@
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));
}