[index] For an ObjC message call, also record as receivers the protocols if they...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@340109 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Index/IndexBody.cpp b/lib/Index/IndexBody.cpp
index d79f0c39671737bb4df970d84ba61fd4eacca971..dd8a1c7b3f71d86008498d138ed13e7ce48beaf6 100644 (file)
--- a/lib/Index/IndexBody.cpp
+++ b/lib/Index/IndexBody.cpp
@@ -259,8 +259,24 @@ public:
 
       if (isDynamic(E)) {
         Roles |= (unsigned)SymbolRole::Dynamic;
-        if (auto *RecD = E->getReceiverInterface())
-          Relations.emplace_back((unsigned)SymbolRole::RelationReceivedBy, RecD);
+
+        auto addReceivers = [&](const ObjCObjectType *Ty) {
+          if (!Ty)
+            return;
+          if (const auto *clsD = Ty->getInterface()) {
+            Relations.emplace_back((unsigned)SymbolRole::RelationReceivedBy,
+                                   clsD);
+          }
+          for (const auto *protD : Ty->quals()) {
+            Relations.emplace_back((unsigned)SymbolRole::RelationReceivedBy,
+                                   protD);
+          }
+        };
+        QualType recT = E->getReceiverType();
+        if (const auto *Ptr = recT->getAs<ObjCObjectPointerType>())
+          addReceivers(Ptr->getObjectType());
+        else
+          addReceivers(recT->getAs<ObjCObjectType>());
       }
 
       return IndexCtx.handleReference(MD, E->getSelectorStartLoc(),

diff --git a/test/Index/Core/index-source.m b/test/Index/Core/index-source.m
index 2931e664eac6a90a1a02583493fdf3240992fa37..c319be63ab9eeed5db40f81b73b91bf93d0dfed3 100644 (file)
--- a/test/Index/Core/index-source.m
+++ b/test/Index/Core/index-source.m
@@ -2,7 +2,7 @@
 // RUN: c-index-test core -print-source-symbols -include-locals -- %s -target x86_64-apple-macosx10.7 | FileCheck -check-prefix=LOCAL %s
 
 @interface Base
-// CHECK: [[@LINE-1]]:12 | class/ObjC | Base | c:objc(cs)Base | _OBJC_CLASS_$_Base | Decl | rel: 0
+// CHECK: [[@LINE-1]]:12 | class/ObjC | Base | [[BASE_USR:.*]] | _OBJC_CLASS_$_Base | Decl | rel: 0
 -(void)meth;
 // CHECK: [[@LINE-1]]:8 | instance-method/ObjC | meth | c:objc(cs)Base(im)meth | -[Base meth] | Decl,Dyn,RelChild | rel: 1
 // CHECK-NEXT: RelChild | Base | c:objc(cs)Base
@@ -60,7 +60,7 @@ void goo(Base *b) {
   Base *f = (Base *) 2;
 }
 
-// CHECK: [[@LINE+1]]:11 | protocol/ObjC | Prot1 | c:objc(pl)Prot1 | <no-cgname> | Decl | rel: 0
+// CHECK: [[@LINE+1]]:11 | protocol/ObjC | Prot1 | [[PROT1_USR:.*]] | <no-cgname> | Decl | rel: 0
 @protocol Prot1
 @end
 
@@ -472,3 +472,21 @@ void testImplicitProperties(ImplicitProperties *c) {
 }
 
 @end
+
+@protocol Prot3 // CHECK: [[@LINE]]:11 | protocol/ObjC | Prot3 | [[PROT3_USR:.*]] | <no-cgname> | Decl |
+-(void)meth;
+@end
+
+void test_rec1() {
+  id<Prot3, Prot1> o1;
+  [o1 meth]; // CHECK: [[@LINE]]:7 | instance-method/ObjC | meth | {{.*}} | Ref,Call,Dyn,RelRec,RelCall,RelCont | rel: 3
+    // CHECK-NEXT: RelCall,RelCont | test_rec1 |
+    // CHECK-NEXT: RelRec | Prot3 | [[PROT3_USR]]
+    // CHECK-NEXT: RelRec | Prot1 | [[PROT1_USR]]
+  Base<Prot3, Prot1> *o2;
+  [o2 meth]; // CHECK: [[@LINE]]:7 | instance-method/ObjC | meth | {{.*}} | Ref,Call,Dyn,RelRec,RelCall,RelCont | rel: 4
+    // CHECK-NEXT: RelCall,RelCont | test_rec1 |
+    // CHECK-NEXT: RelRec | Base | [[BASE_USR]]
+    // CHECK-NEXT: RelRec | Prot3 | [[PROT3_USR]]
+    // CHECK-NEXT: RelRec | Prot1 | [[PROT1_USR]]
+}