Reusing an existing attribute diagnostic

[oren_ben_simhon]

Summary

In a previous patch, I added a new generic error diagnostic for inconsistent attributes.
In this patch I reuse this diagnostic for ns_returns_retained attribute check.

[aaron.ballman]

lib/Sema/SemaDecl.cpp

2955 ↗

(On Diff #97271)

You should manually quote the ns_returns_retained string literal with single quotes. The old diagnostic didn't do this, but that was inconsistent with the way we usually try to handle diagnostics.

[oren_ben_simhon]

Implemented comments posted until 05/02 (Thanks Aaron)

[aaron.ballman]

LGTM!

cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td

def warn_cconv_varargs : Warning<
   "%0 calling convention ignored on variadic function">,
   InGroup<IgnoredAttributes>;
 def warn_cconv_structors : Warning<
   "%0 calling convention ignored on constructor/destructor">,
   InGroup<IgnoredAttributes>;
 def err_regparm_mismatch : Error<"function declared with regparm(%0) "
   "attribute was previously declared "
   "%plural{0:without the regparm|:with the regparm(%1)}1 attribute">;
-def err_returns_retained_mismatch : Error<
-  "function declared with the ns_returns_retained attribute "
-  "was previously declared without the ns_returns_retained attribute">;
 def err_function_attribute_mismatch : Error<
   "function declared with %0 attribute "
   "was previously declared without the %0 attribute">;
 def err_objc_precise_lifetime_bad_type : Error<
   "objc_precise_lifetime only applies to retainable types; type here is %0">;
 def warn_objc_precise_lifetime_meaningless : Error<
   "objc_precise_lifetime is not meaningful for "
   "%select{__unsafe_unretained|__autoreleasing}0 objects">;

cfe/trunk/lib/Sema/SemaDecl.cpp

if (OldTypeInfo.getHasRegParm() != NewTypeInfo.getHasRegParm() ||
 
     NewTypeInfo = NewTypeInfo.withRegParm(OldTypeInfo.getRegParm());
     RequiresAdjustment = true;
   }
 
   // Merge ns_returns_retained attribute.
   if (OldTypeInfo.getProducesResult() != NewTypeInfo.getProducesResult()) {
     if (NewTypeInfo.getProducesResult()) {
-      Diag(New->getLocation(), diag::err_returns_retained_mismatch);
+      Diag(New->getLocation(), diag::err_function_attribute_mismatch)
+          << "'ns_returns_retained'";
       Diag(OldLocation, diag::note_previous_declaration);
       return true;
     }
 
     NewTypeInfo = NewTypeInfo.withProducesResult(true);
     RequiresAdjustment = true;
   }
 

cfe/trunk/test/SemaObjCXX/arc-overloading.mm

 @end
 
 class rdar10142572 {
   id f() __attribute__((ns_returns_retained));
   id g(); // expected-note{{previous declaration}}
 };
 
 id rdar10142572::f() { return 0; } // okay: merged down
-id __attribute__((ns_returns_retained)) rdar10142572::g() { return 0; } // expected-error{{function declared with the ns_returns_retained attribute was previously declared without the ns_returns_retained attribute}}
+id __attribute__((ns_returns_retained)) rdar10142572::g() { return 0; } // expected-error{{function declared with 'ns_returns_retained' attribute was previously declared without the 'ns_returns_retained' attribute}}