diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 4 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaObjCProperty.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 0b3a8ed6987..805c2dd0886 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -635,8 +635,8 @@ def warn_auto_synthesizing_protocol_property :Warning< " declared in a protocol">, InGroup<DiagGroup<"objc-protocol-property-synthesis">>; def warn_autosynthesis_property_ivar_match :Warning< - "autosynthesized property '%0' will use %select{|synthesized}1 instance variable " - "'%2', not existing instance variable '%3'">, + "autosynthesized property %0 will use %select{|synthesized}1 instance variable " + "%2, not existing instance variable %3">, InGroup<DiagGroup<"objc-autosynthesis-property-ivar-name-match">>; def warn_missing_explicit_synthesis : Warning < "auto property synthesis is synthesizing property not explicitly synthesized">, diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp index 1794f6618a1..aace5ec11bf 100644 --- a/clang/lib/Sema/SemaObjCProperty.cpp +++ b/clang/lib/Sema/SemaObjCProperty.cpp @@ -829,8 +829,8 @@ Decl *Sema::ActOnPropertyImplDecl(Scope *S, if (originalIvar) { Diag(PropertyDiagLoc, diag::warn_autosynthesis_property_ivar_match) - << property->getName() << (Ivar == 0) << PropertyIvar->getName() - << originalIvar->getName(); + << propertyId << (Ivar == 0) << PropertyIvar + << originalIvar->getIdentifier(); Diag(property->getLocation(), diag::note_property_declare); Diag(originalIvar->getLocation(), diag::note_ivar_decl); } |
