Merge pull request swiftlang#63675 from hborla/macro-re-typechecking

[Macros] Remove the `MacroRoles` argument to `ResolveMacroRequest`.

Author: hborla

include/swift/AST/TypeCheckRequests.h

@@ -3162,6 +3162,9 @@ class UnresolvedMacroReference {
   ArrayRef<TypeRepr *> getGenericArgs() const;
   ArgumentList *getArgs() const;
 
+  /// Returns the macro roles corresponding to this macro reference.
+  MacroRoles getMacroRoles() const;
+
   friend bool operator==(const UnresolvedMacroReference &lhs,
                          const UnresolvedMacroReference &rhs) {
     return lhs.getOpaqueValue() == rhs.getOpaqueValue();
@@ -3178,7 +3181,7 @@ void simple_display(llvm::raw_ostream &out,
 /// Resolve a given custom attribute to an attached macro declaration.
 class ResolveMacroRequest
     : public SimpleRequest<ResolveMacroRequest,
-                           MacroDecl *(UnresolvedMacroReference, MacroRoles,
+                           MacroDecl *(UnresolvedMacroReference,
                                        DeclContext *),
                            RequestFlags::Cached> {
 public:
@@ -3189,7 +3192,7 @@ class ResolveMacroRequest
 
   MacroDecl *
   evaluate(Evaluator &evaluator, UnresolvedMacroReference macroRef,
-           MacroRoles roles, DeclContext *dc) const;
+           DeclContext *dc) const;
 
 public:
   bool isCached() const { return true; }

lib/AST/ASTMangler.cpp

@@ -3804,7 +3804,7 @@ void ASTMangler::appendMacroExpansionContext(
     auto *macroDecl = evaluateOrDefault(
         ctx.evaluator,
         ResolveMacroRequest{const_cast<CustomAttr *>(attr),
-                            getAttachedMacroRoles(), outerExpansionDC},
+                            outerExpansionDC},
         nullptr);
     if (macroDecl)
       baseName = macroDecl->getBaseName();
@@ -3898,7 +3898,7 @@ std::string ASTMangler::mangleAttachedMacroExpansion(
   StringRef macroName;
   auto *macroDecl = evaluateOrDefault(
       decl->getASTContext().evaluator,
-      ResolveMacroRequest{attr, role, macroDeclContext},
+      ResolveMacroRequest{attr, macroDeclContext},
       nullptr);
   if (macroDecl)
     macroName = macroDecl->getName().getBaseName().userFacingName();

lib/AST/Attr.cpp

@@ -2382,8 +2382,7 @@ bool CustomAttr::isAttachedMacro(const Decl *decl) const {
 
   auto *macroDecl = evaluateOrDefault(
       ctx.evaluator,
-      ResolveMacroRequest{const_cast<CustomAttr *>(this),
-                          getAttachedMacroRoles(), dc},
+      ResolveMacroRequest{const_cast<CustomAttr *>(this), dc},
       nullptr);
 
   return macroDecl != nullptr;

lib/AST/Decl.cpp

@@ -406,7 +406,7 @@ void Decl::forEachAttachedMacro(MacroRole role,
     auto customAttr = const_cast<CustomAttr *>(customAttrConst);
     auto *macroDecl = evaluateOrDefault(
         ctx.evaluator,
-        ResolveMacroRequest{customAttr, getAttachedMacroRoles(), dc},
+        ResolveMacroRequest{customAttr, dc},
         nullptr);
 
     if (!macroDecl)

lib/AST/NameLookup.cpp

@@ -1523,7 +1523,7 @@ populateLookupTableEntryFromMacroExpansions(ASTContext &ctx,
     if (!med)
       continue;
     auto macro = evaluateOrDefault(
-        ctx.evaluator, ResolveMacroRequest{med, MacroRole::Declaration, dc},
+        ctx.evaluator, ResolveMacroRequest{med, dc},
         nullptr);
     if (!macro)
       continue;

lib/AST/TypeCheckRequests.cpp

@@ -1742,6 +1742,19 @@ ArgumentList *UnresolvedMacroReference::getArgs() const {
   llvm_unreachable("Unhandled case");
 }
 
+MacroRoles UnresolvedMacroReference::getMacroRoles() const {
+  if (pointer.is<MacroExpansionExpr *>())
+    return MacroRole::Expression;
+
+  if (pointer.is<MacroExpansionDecl *>())
+    return getFreestandingMacroRoles();
+
+  if (pointer.is<CustomAttr *>())
+    return getAttachedMacroRoles();
+
+  llvm_unreachable("Unsupported macro reference");
+}
+
 void swift::simple_display(llvm::raw_ostream &out,
                            const UnresolvedMacroReference &ref) {
   if (ref.getDecl())

lib/IDE/SourceEntityWalker.cpp

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

lib/Sema/CSApply.cpp

@@ -5365,7 +5365,12 @@ namespace {
       ConcreteDeclRef macroRef = resolveConcreteDeclRef(macro, locator);
       E->setMacroRef(macroRef);
 
-      if (E->getMacroRoles().contains(MacroRole::Expression) &&
+      // For now, only expand macro expansion expressions that fulfill
+      // `MacroRole::Expression` exactly. Freestanding code item macros
+      // have a `getMacroRoles()` value equal to `getFreestandingMacroRoles()`,
+      // which includes expression macros, and they are expanded in a separate
+      // request.
+      if (E->getMacroRoles() == MacroRole::Expression &&
           !cs.Options.contains(ConstraintSystemFlags::DisableMacroExpansions)) {
         if (auto newExpr = expandMacroExpr(dc, E, macroRef, expandedType)) {
           E->setRewritten(newExpr);

lib/Sema/TypeCheckAttr.cpp

@@ -3568,7 +3568,7 @@ void AttributeChecker::visitCustomAttr(CustomAttr *attr) {
   if (!nominal) {
     // Try resolving an attached macro attribute.
     auto *macro = evaluateOrDefault(
-        Ctx.evaluator, ResolveMacroRequest{attr, getAttachedMacroRoles(), dc},
+        Ctx.evaluator, ResolveMacroRequest{attr, dc},
         nullptr);
     if (macro || !attr->isValid())
       return;

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -3782,7 +3782,7 @@ ExpandMacroExpansionDeclRequest::evaluate(Evaluator &evaluator,
   MacroDecl *macro;
   if (auto *args = MED->getArgs()) {
     macro = evaluateOrDefault(
-        ctx.evaluator, ResolveMacroRequest{MED, MacroRole::Declaration, dc},
+        ctx.evaluator, ResolveMacroRequest{MED, dc},
         nullptr);
   }
   else {