[Diagnostics] Add declaration name to macro_attached_to_invalid_decl

This could also use `%kind` for the declaration kind, but that ends up
being "extension of struct" instead of just "extension", which seems
slightly worse.

Author: bnbarham

include/swift/AST/DiagnosticsSema.def

@@ -7232,8 +7232,8 @@ ERROR(extension_macro_invalid_conformance,none,
       "invalid protocol conformance %0 in extension macro",
       (Type))
 ERROR(macro_attached_to_invalid_decl,none,
-      "'%0' macro cannot be attached to %1",
-      (StringRef, DescriptiveDeclKind))
+      "'%0' macro cannot be attached to %1 (%base2)",
+      (StringRef, DescriptiveDeclKind, const Decl *))
 ERROR(conformance_macro,none,
       "conformance macros are replaced by extension macros",
       ())

lib/Sema/TypeCheckAttr.cpp

@@ -3688,10 +3688,9 @@ void AttributeChecker::visitCustomAttr(CustomAttr *attr) {
       for (auto *roleAttr : macro->getAttrs().getAttributes<MacroRoleAttr>()) {
         auto role = roleAttr->getMacroRole();
         if (isInvalidAttachedMacro(role, D)) {
-          diagnoseAndRemoveAttr(attr,
-                                diag::macro_attached_to_invalid_decl,
+          diagnoseAndRemoveAttr(attr, diag::macro_attached_to_invalid_decl,
                                 getMacroRoleString(role),
-                                D->getDescriptiveKind());
+                                D->getDescriptiveKind(), D);
         }
       }
 

test/Macros/accessor_macros.swift

@@ -114,5 +114,5 @@ struct MyBrokenStruct {
 
 @myPropertyWrapper
 struct CannotHaveAccessors {}
-// CHECK-DIAGS: 'accessor' macro cannot be attached to struct
+// CHECK-DIAGS: 'accessor' macro cannot be attached to struct ('CannotHaveAccessors')
 #endif

test/Macros/macro_expand_attributes.swift

@@ -144,9 +144,9 @@ expansionOrder.originalMember = 28
 #if TEST_DIAGNOSTICS
 @wrapAllProperties
 typealias A = Int
-// expected-error@-2{{'memberAttribute' macro cannot be attached to type alias}}
+// expected-error@-2{{'memberAttribute' macro cannot be attached to type alias ('A')}}
 
 @wrapAllProperties
 func noMembers() {}
-// expected-error@-2{{'memberAttribute' macro cannot be attached to global function}}
+// expected-error@-2{{'memberAttribute' macro cannot be attached to global function ('noMembers')}}
 #endif

test/Macros/macro_expand_extensions.swift

@@ -113,11 +113,11 @@ func testLocal() {
 
 @DelegatedConformance
 typealias A = Int
-// expected-error@-2 {{'extension' macro cannot be attached to type alias}}
+// expected-error@-2 {{'extension' macro cannot be attached to type alias ('A')}}
 
 @DelegatedConformance
 extension Int {}
-// expected-error@-2 {{'extension' macro cannot be attached to extension}}
+// expected-error@-2 {{'extension' macro cannot be attached to extension (extension of 'Int')}}
 
 @attached(extension, conformances: P)
 macro UndocumentedNamesInExtension() = #externalMacro(module: "MacroDefinition", type: "DelegatedConformanceViaExtensionMacro")

test/Macros/macro_expand_peers.swift

@@ -217,7 +217,7 @@ func testVarPeer() {
 #if TEST_DIAGNOSTICS
 // Macros cannot be attached to function parameters
 
-// expected-error@+1{{'peer' macro cannot be attached to parameter}}
+// expected-error@+1{{'peer' macro cannot be attached to parameter ('x')}}
 func test(@declareVarValuePeer x: Int) {}
 #endif