[Macro] API digester support for macro declarations

Author: DougGregor

include/swift/APIDigester/ModuleAnalyzerNodes.h

@@ -674,6 +674,13 @@ class SDKNodeDeclVar : public SDKNodeDecl {
   void addAccessor(SDKNode* AC);
 };
 
+class SDKNodeDeclMacro : public SDKNodeDecl {
+public:
+  SDKNodeDeclMacro(SDKNodeInitInfo Info);
+  static bool classof(const SDKNode *N);
+  SDKNodeType *getType() const;
+};
+
 class SDKNodeDeclAbstractFunc : public SDKNodeDecl {
   bool IsThrowing;
   bool ReqNewWitnessTableEntry;
@@ -796,6 +803,7 @@ class SwiftDeclCollector: public VisibleDeclConsumer {
   SDKNode *constructSubscriptDeclNode(SubscriptDecl *SD);
   SDKNode *constructAssociatedTypeNode(AssociatedTypeDecl *ATD);
   SDKNode *constructTypeAliasNode(TypeAliasDecl *TAD);
+  SDKNode *constructMacroNode(MacroDecl *MAD);
   SDKNode *constructVarNode(ValueDecl *VD);
   SDKNode *constructExternalExtensionNode(NominalTypeDecl *NTD,
                                           ArrayRef<ExtensionDecl*> AllExts);

include/swift/IDE/DigesterEnums.def

@@ -74,7 +74,8 @@ NODE_KIND(DeclVar, Var)
 NODE_KIND(DeclTypeAlias, TypeAlias)
 NODE_KIND(DeclImport, Import)
 NODE_KIND(DeclAssociatedType, AssociatedType)
-NODE_KIND_RANGE(Decl, DeclFunction, DeclAssociatedType)
+NODE_KIND(DeclMacro, Macro)
+NODE_KIND_RANGE(Decl, DeclFunction, DeclMacro)
 
 NODE_ANNOTATION(Added)
 NODE_ANNOTATION(Removed)

lib/APIDigester/ModuleAnalyzerNodes.cpp

@@ -172,6 +172,9 @@ SDKNodeDeclVar::SDKNodeDeclVar(SDKNodeInitInfo Info):
   SDKNodeDecl(Info, SDKNodeKind::DeclVar), IsLet(Info.IsLet),
   HasStorage(Info.HasStorage) {}
 
+SDKNodeDeclMacro::SDKNodeDeclMacro(SDKNodeInitInfo Info):
+  SDKNodeDecl(Info, SDKNodeKind::DeclMacro) {}
+
 SDKNodeDeclAbstractFunc::SDKNodeDeclAbstractFunc(SDKNodeInitInfo Info,
   SDKNodeKind Kind): SDKNodeDecl(Info, Kind), IsThrowing(Info.IsThrowing),
                      ReqNewWitnessTableEntry(Info.ReqNewWitnessTableEntry),
@@ -226,6 +229,10 @@ SDKNodeType *SDKNodeDeclVar::getType() const {
   return cast<SDKNodeType>(childAt(0));
 }
 
+SDKNodeType *SDKNodeDeclMacro::getType() const {
+  return cast<SDKNodeType>(childAt(0));
+}
+
 NodePtr UpdatedNodesMap::findUpdateCounterpart(const SDKNode *Node) const {
   assert(Node->isAnnotatedAs(NodeAnnotation::Updated) && "Not update operation.");
   auto FoundPair = std::find_if(MapImpl.begin(), MapImpl.end(),
@@ -409,6 +416,7 @@ StringRef SDKNodeType::getTypeRoleDescription() const {
     return SDKNodeDeclAbstractFunc::getTypeRoleDescription(Ctx,
       P->getChildIndex(this));
   case SDKNodeKind::DeclVar:
+  case SDKNodeKind::DeclMacro:
     return "declared";
   case SDKNodeKind::DeclTypeAlias:
     return "underlying";
@@ -993,6 +1001,7 @@ static bool isSDKNodeEqual(SDKContext &Ctx, const SDKNode &L, const SDKNode &R)
         return false;
       LLVM_FALLTHROUGH;
     }
+    case SDKNodeKind::DeclMacro:
     case SDKNodeKind::Conformance:
     case SDKNodeKind::TypeWitness:
     case SDKNodeKind::DeclImport:
@@ -1833,6 +1842,13 @@ SwiftDeclCollector::constructTypeAliasNode(TypeAliasDecl *TAD) {
   return Alias;
 }
 
+SDKNode *swift::ide::api::
+SwiftDeclCollector::constructMacroNode(MacroDecl *MD) {
+  auto Macro = SDKNodeInitInfo(Ctx, MD).createSDKNode(SDKNodeKind::DeclMacro);
+  Macro->addChild(constructTypeNode(MD->getInterfaceType(), TypeInitInfo()));
+  return Macro;
+}
+
 SDKNode *swift::ide::api::
 SwiftDeclCollector::constructAssociatedTypeNode(AssociatedTypeDecl *ATD) {
   auto Asso = SDKNodeInitInfo(Ctx, ATD).
@@ -2028,6 +2044,8 @@ void SwiftDeclCollector::processValueDecl(ValueDecl *VD) {
     RootNode->addChild(constructVarNode(VAD));
   } else if (auto TAD = dyn_cast<TypeAliasDecl>(VD)) {
     RootNode->addChild(constructTypeAliasNode(TAD));
+  } else if (auto MD = dyn_cast<MacroDecl>(VD)) {
+    RootNode->addChild(constructMacroNode(MD));
   } else {
     llvm_unreachable("unhandled value decl");
   }

lib/DriverTool/swift_api_digester_main.cpp

@@ -828,7 +828,8 @@ class PrunePass : public MatchedNodeListener, public SDKTreeDiffPass {
     case SDKNodeKind::DeclImport:
     case SDKNodeKind::TypeFunc:
     case SDKNodeKind::TypeNominal:
-    case SDKNodeKind::TypeAlias: {
+    case SDKNodeKind::TypeAlias:
+    case SDKNodeKind::DeclMacro: {
       // If matched nodes are both function/var/TypeAlias decls, mapping their
       // parameters sequentially.
       SequentialNodeMatcher SNMatcher(Left->getChildren(), Right->getChildren(),