2 files changed, 31 insertions, 16 deletions

diff --git a/clang/lib/Index/IndexBody.cpp b/clang/lib/Index/IndexBody.cpp
index f7164453db6..fda8388a324 100644
--- a/clang/lib/Index/IndexBody.cpp
+++ b/clang/lib/Index/IndexBody.cpp
@@ -88,7 +88,7 @@ public:
 
     } else if (auto CE = dyn_cast<CallExpr>(Parent)) {
       if (CE->getCallee()->IgnoreParenCasts() == E) {
-        Roles |= (unsigned)SymbolRole::Call;
+        addCallRole(Roles, Relations);
         if (auto *ME = dyn_cast<MemberExpr>(E)) {
           if (auto *CXXMD = dyn_cast_or_null<CXXMethodDecl>(ME->getMemberDecl()))
             if (CXXMD->isVirtual() && !ME->hasQualifier()) {
@@ -120,6 +120,15 @@ public:
     return Roles;
   }
 
+  void addCallRole(SymbolRoleSet &Roles,
+                   SmallVectorImpl<SymbolRelation> &Relations) {
+    Roles |= (unsigned)SymbolRole::Call;
+    if (auto *FD = dyn_cast<FunctionDecl>(ParentDC))
+      Relations.emplace_back((unsigned)SymbolRole::RelationCalledBy, FD);
+    else if (auto *MD = dyn_cast<ObjCMethodDecl>(ParentDC))
+      Relations.emplace_back((unsigned)SymbolRole::RelationCalledBy, MD);
+  }
+
   bool VisitDeclRefExpr(DeclRefExpr *E) {
     SmallVector<SymbolRelation, 4> Relations;
     SymbolRoleSet Roles = getRolesForRef(E, Relations);
@@ -169,11 +178,12 @@ public:
     };
 
     if (ObjCMethodDecl *MD = E->getMethodDecl()) {
-      SymbolRoleSet Roles = (unsigned)SymbolRole::Call;
+      SymbolRoleSet Roles{};
+      SmallVector<SymbolRelation, 2> Relations;
+      addCallRole(Roles, Relations);
       if (E->isImplicit())
         Roles |= (unsigned)SymbolRole::Implicit;
 
-      SmallVector<SymbolRelation, 2> Relations;
       if (isDynamic(E)) {
         Roles |= (unsigned)SymbolRole::Dynamic;
         if (auto *RecD = E->getReceiverInterface())
@@ -206,39 +216,42 @@ public:
                                     Parent, ParentDC, SymbolRoleSet(), {}, E);
   }
 
+  bool passObjCLiteralMethodCall(const ObjCMethodDecl *MD, const Expr *E) {
+    SymbolRoleSet Roles{};
+    SmallVector<SymbolRelation, 2> Relations;
+    addCallRole(Roles, Relations);
+    Roles |= (unsigned)SymbolRole::Implicit;
+    return IndexCtx.handleReference(MD, E->getLocStart(),
+                                    Parent, ParentDC, Roles, Relations, E);
+  }
+
   bool VisitObjCBoxedExpr(ObjCBoxedExpr *E) {
     if (ObjCMethodDecl *MD = E->getBoxingMethod()) {
-      SymbolRoleSet Roles = (unsigned)SymbolRole::Call;
-      Roles |= (unsigned)SymbolRole::Implicit;
-      return IndexCtx.handleReference(MD, E->getLocStart(),
-                                      Parent, ParentDC, Roles, {}, E);
+      return passObjCLiteralMethodCall(MD, E);
     }
     return true;
   }
   
   bool VisitObjCDictionaryLiteral(ObjCDictionaryLiteral *E) {
     if (ObjCMethodDecl *MD = E->getDictWithObjectsMethod()) {
-      SymbolRoleSet Roles = (unsigned)SymbolRole::Call;
-      Roles |= (unsigned)SymbolRole::Implicit;
-      return IndexCtx.handleReference(MD, E->getLocStart(),
-                                      Parent, ParentDC, Roles, {}, E);
+      return passObjCLiteralMethodCall(MD, E);
     }
     return true;
   }
 
   bool VisitObjCArrayLiteral(ObjCArrayLiteral *E) {
     if (ObjCMethodDecl *MD = E->getArrayWithObjectsMethod()) {
-      SymbolRoleSet Roles = (unsigned)SymbolRole::Call;
-      Roles |= (unsigned)SymbolRole::Implicit;
-      return IndexCtx.handleReference(MD, E->getLocStart(),
-                                      Parent, ParentDC, Roles, {}, E);
+      return passObjCLiteralMethodCall(MD, E);
     }
     return true;
   }
 
   bool VisitCXXConstructExpr(CXXConstructExpr *E) {
+    SymbolRoleSet Roles{};
+    SmallVector<SymbolRelation, 2> Relations;
+    addCallRole(Roles, Relations);
     return IndexCtx.handleReference(E->getConstructor(), E->getLocation(),
-                                    Parent, ParentDC, (unsigned)SymbolRole::Call, {}, E);
+                                    Parent, ParentDC, Roles, Relations, E);
   }
 
   bool TraverseCXXOperatorCallExpr(CXXOperatorCallExpr *E,
diff --git a/clang/lib/Index/IndexSymbol.cpp b/clang/lib/Index/IndexSymbol.cpp
index 96da7a7989c..39812c4fe4f 100644
--- a/clang/lib/Index/IndexSymbol.cpp
+++ b/clang/lib/Index/IndexSymbol.cpp
@@ -206,6 +206,7 @@ void index::applyForEachSymbolRole(SymbolRoleSet Roles,
   APPLY_FOR_ROLE(RelationBaseOf);
   APPLY_FOR_ROLE(RelationOverrideOf);
   APPLY_FOR_ROLE(RelationReceivedBy);
+  APPLY_FOR_ROLE(RelationCalledBy);
 
 #undef APPLY_FOR_ROLE
 }
@@ -231,6 +232,7 @@ void index::printSymbolRoles(SymbolRoleSet Roles, raw_ostream &OS) {
     case SymbolRole::RelationBaseOf: OS << "RelBase"; break;
     case SymbolRole::RelationOverrideOf: OS << "RelOver"; break;
     case SymbolRole::RelationReceivedBy: OS << "RelRec"; break;
+    case SymbolRole::RelationCalledBy: OS << "RelCall"; break;
     }
   });
 }