[index] Subsume CallRefIndexSymbol into IndexSymbol

Eventually we should just have one IndexSymbol, with all the
information. Once we kill FuncDeclIndexSymbol and can get rid of the
enum,  we will regain most of the bytes we lost by inlining receiverUSR.

Author: benlangmuir

include/swift/Index/IndexSymbol.h

@@ -78,7 +78,7 @@ using SymbolRole = clang::index::SymbolRole;
 using SymbolRoleSet = clang::index::SymbolRoleSet;
 
 struct IndexSymbol {
-  enum TypeKind { Base, FuncDecl, CallReference };
+  enum TypeKind { Base, FuncDecl };
   TypeKind entityType = Base;
 
   SymbolKind kind;
@@ -89,6 +89,7 @@ struct IndexSymbol {
   StringRef name;
   StringRef USR; // USR may be safely compared by pointer.
   StringRef group;
+  StringRef receiverUSR;
   unsigned line = 0;
   unsigned column = 0;
 
@@ -104,10 +105,6 @@ struct FuncDeclIndexSymbol : public IndexSymbol {
   FuncDeclIndexSymbol() : IndexSymbol(FuncDecl) {}
 };
 
-struct CallRefIndexSymbol : public IndexSymbol {
-  StringRef ReceiverUSR;
-  CallRefIndexSymbol() : IndexSymbol(CallReference) {}
-};
 
 SymbolKind getSymbolKindForDecl(const Decl *D);
 

lib/Index/Index.cpp

@@ -280,7 +280,7 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
                        IndexSymbol &Info);
   bool initFuncDeclIndexSymbol(ValueDecl *D, FuncDeclIndexSymbol &Info);
   bool initCallRefIndexSymbol(Expr *CurrentE, Expr *ParentE, ValueDecl *D,
-                              SourceLoc Loc, CallRefIndexSymbol &Info);
+                              SourceLoc Loc, IndexSymbol &Info);
 
   std::pair<unsigned, unsigned> getLineCol(SourceLoc Loc) {
     if (Loc.isInvalid())
@@ -481,7 +481,7 @@ bool IndexSwiftASTWalker::startEntityRef(ValueDecl *D, SourceLoc Loc) {
     return false;
 
   if (isa<AbstractFunctionDecl>(D)) {
-    CallRefIndexSymbol Info;
+    IndexSymbol Info;
     if (initCallRefIndexSymbol(ExprStack.back(), getParentExpr(), D, Loc, Info))
       return false;
 
@@ -590,7 +590,7 @@ bool IndexSwiftASTWalker::reportPseudoAccessor(AbstractStorageDecl *D,
   };
 
   if (IsRef) {
-    CallRefIndexSymbol Info;
+    IndexSymbol Info;
     if (initCallRefIndexSymbol(ExprStack.back(), getParentExpr(), D, Loc, Info))
       return true; // continue walking.
 
@@ -860,7 +860,7 @@ static bool isDynamicCall(Expr *BaseE, ValueDecl *D) {
 
 bool IndexSwiftASTWalker::initCallRefIndexSymbol(Expr *CurrentE, Expr *ParentE,
                                                  ValueDecl *D, SourceLoc Loc,
-                                                 CallRefIndexSymbol &Info) {
+                                                 IndexSymbol &Info) {
   if (!ParentE)
     return true;
 
@@ -888,7 +888,7 @@ bool IndexSwiftASTWalker::initCallRefIndexSymbol(Expr *CurrentE, Expr *ParentE,
 
     if (auto TyD = ReceiverTy->getAnyNominal()) {
       StringRef unused;
-      if (getNameAndUSR(TyD, unused, Info.ReceiverUSR))
+      if (getNameAndUSR(TyD, unused, Info.receiverUSR))
         return true;
       if (isDynamicCall(BaseE, D))
         Info.roles |= (unsigned)SymbolRole::Dynamic;

tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp

@@ -103,6 +103,15 @@ class SKIndexDataConsumer : public IndexDataConsumer {
       info.Column = symbol.column;
     };
 
+    if (symbol.roles & (unsigned)SymbolRole::Call) {
+      assert(symbol.entityType == IndexSymbol::Base);
+      CallRefEntityInfo info;
+      initEntity(info, symbol);
+      info.ReceiverUSR = symbol.receiverUSR;
+      info.IsDynamic = symbol.roles & (unsigned)SymbolRole::Dynamic;
+      return func(info);
+    }
+
     switch (symbol.entityType) {
     case IndexSymbol::Base: {
       EntityInfo info;
@@ -116,14 +125,6 @@ class SKIndexDataConsumer : public IndexDataConsumer {
           static_cast<const FuncDeclIndexSymbol &>(symbol).IsTestCandidate;
       return func(info);
     }
-    case IndexSymbol::CallReference: {
-      CallRefEntityInfo info;
-      initEntity(info, symbol);
-      auto call = static_cast<const CallRefIndexSymbol &>(symbol);
-      info.ReceiverUSR = call.ReceiverUSR;
-      info.IsDynamic = call.roles & (unsigned)SymbolRole::Dynamic;
-      return func(info);
-    }
     }
     llvm_unreachable("unexpected symbol kind");
   }