[Macros] Don't invoke ResolveMacroRequest for the same custom attribute with

different DeclContexts.

Author: hborla

Diff for: lib/AST/Attr.cpp

@@ -2378,7 +2378,7 @@ bool CustomAttr::isArgUnsafe() const {
 
 bool CustomAttr::isAttachedMacro(const Decl *decl) const {
   auto &ctx = decl->getASTContext();
-  auto *dc = decl->getInnermostDeclContext();
+  auto *dc = decl->getDeclContext();
 
   auto *macroDecl = evaluateOrDefault(
       ctx.evaluator,

Diff for: lib/IDE/SourceEntityWalker.cpp

@@ -698,7 +698,7 @@ bool SemaAnnotator::handleCustomAttributes(Decl *D) {
       // If this attribute resolves to a macro, index that.
       ASTContext &ctx = D->getASTContext();
       ResolveMacroRequest req{const_cast<CustomAttr *>(customAttr),
-                              D->getInnermostDeclContext()};
+                              D->getDeclContext()};
       if (auto macroDecl = evaluateOrDefault(ctx.evaluator, req, nullptr)) {
         Type macroRefType = macroDecl->getDeclaredInterfaceType();
         if (!passReference(

Diff for: test/Serialization/Inputs/def_macros.swift

@@ -11,3 +11,16 @@
 public struct S {
   public var value: Int
 }
+
+public struct Base {
+  public static func member() -> Base { .init() }
+}
+
+@attached(memberAttribute) public macro wrapAllProperties(
+  _ : Base
+) = #externalMacro(module: "MacroDefinition", type: "WrapAllProperties")
+
+@wrapAllProperties(.member())
+public struct TestMacroArgTypechecking {
+  public var value: Int
+}