commit cba0ebce65667f76e291346d377f402579743cea
author Fariborz Jahanian <fjahanian@apple.com> Sat May 26 16:10:06 2012 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Sat May 26 16:10:06 2012 +0000
tree 2bdce79f541e05c5bb54d893890a5c068e7a006a
parent bdb97ff687ce85e45cc728b87612ed546f48c1e7

Change warning to error when property setter names conflict.
// rdar://11528439


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

lib/Sema/SemaPseudoObject.cpp

diff --git a/lib/Sema/SemaPseudoObject.cpp b/lib/Sema/SemaPseudoObject.cpp
index 82bf79b..4921ec9 100644
--- a/lib/Sema/SemaPseudoObject.cpp
+++ b/lib/Sema/SemaPseudoObject.cpp
@@ -543,7 +543,7 @@
         IdentifierInfo *AltMember = &S.PP.getIdentifierTable().get(PropertyName);
         if (ObjCPropertyDecl *prop1 = IFace->FindPropertyDeclaration(AltMember))
           if (prop != prop1 && (prop1->getSetterMethodDecl() == setter)) {
-            S.Diag(RefExpr->getExprLoc(), diag::warn_property_setter_ambiguous_use)
+            S.Diag(RefExpr->getExprLoc(), diag::error_property_setter_ambiguous_use)
               << prop->getName() << prop1->getName() << setter->getSelector();
             S.Diag(prop->getLocation(), diag::note_property_declare);
             S.Diag(prop1->getLocation(), diag::note_property_declare);