[index] Add 'call' and 'isDynamic' roles

Author: benlangmuir

include/swift/Index/IndexSymbol.h

@@ -106,8 +106,6 @@ struct FuncDeclIndexSymbol : public IndexSymbol {
 
 struct CallRefIndexSymbol : public IndexSymbol {
   StringRef ReceiverUSR;
-  bool IsDynamic = false;
-
   CallRefIndexSymbol() : IndexSymbol(CallReference) {}
 };
 

lib/Index/Index.cpp

@@ -867,6 +867,8 @@ bool IndexSwiftASTWalker::initCallRefIndexSymbol(Expr *CurrentE, Expr *ParentE,
   if (initIndexSymbol(D, Loc, /*IsRef=*/true, Info))
     return true;
 
+  Info.roles |= (unsigned)SymbolRole::Call;
+
   Expr *BaseE = nullptr;
   if (auto DotE = dyn_cast<DotSyntaxCallExpr>(ParentE))
     BaseE = DotE->getBase();
@@ -888,7 +890,8 @@ bool IndexSwiftASTWalker::initCallRefIndexSymbol(Expr *CurrentE, Expr *ParentE,
       StringRef unused;
       if (getNameAndUSR(TyD, unused, Info.ReceiverUSR))
         return true;
-      Info.IsDynamic = isDynamicCall(BaseE, D);
+      if (isDynamicCall(BaseE, D))
+        Info.roles |= (unsigned)SymbolRole::Dynamic;
     }
   }
 

tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp

@@ -121,7 +121,7 @@ class SKIndexDataConsumer : public IndexDataConsumer {
       initEntity(info, symbol);
       auto call = static_cast<const CallRefIndexSymbol &>(symbol);
       info.ReceiverUSR = call.ReceiverUSR;
-      info.IsDynamic = call.IsDynamic;
+      info.IsDynamic = call.roles & (unsigned)SymbolRole::Dynamic;
       return func(info);
     }
     }