mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-26 00:06:06 +00:00
Code Issues Projects Releases Wiki Activity

[index] Report references of ObjC super class/protocols in interfaces and protocols.

Browse Source 
llvm-svn: 262584
This commit is contained in:
Argyrios Kyrtzidis 2016-03-03 05:33:54 +00:00
parent d68a4d6ae0
commit 34a0c1a572
2 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
clang/lib/Index/IndexDecl.cpp
View File

@ -14,6 +14,12 @@
using namespace clang;
using namespace index;
#define TRY_TO(CALL_EXPR) \
do { \
if (!CALL_EXPR) \
return false; \
} while (0)
namespace {
class IndexingDeclVisitor : public ConstDeclVisitor<IndexingDeclVisitor, bool> {
@ -196,11 +202,30 @@ public:
return true;
}
bool handleReferencedProtocols(const ObjCProtocolList &ProtList,
const ObjCContainerDecl *ContD) {
ObjCInterfaceDecl::protocol_loc_iterator LI = ProtList.loc_begin();
for (ObjCInterfaceDecl::protocol_iterator
I = ProtList.begin(), E = ProtList.end(); I != E; ++I, ++LI) {
SourceLocation Loc = *LI;
ObjCProtocolDecl *PD = *I;
TRY_TO(IndexCtx.handleReference(PD, Loc, ContD, ContD,
SymbolRoleSet(),
SymbolRelation{(unsigned)SymbolRole::RelationBaseOf, ContD}));
}
return true;
}
bool VisitObjCInterfaceDecl(const ObjCInterfaceDecl *D) {
if (D->isThisDeclarationADefinition()) {
if (!IndexCtx.handleDecl(D))
return false;
IndexCtx.indexDeclContext(D);
TRY_TO(IndexCtx.handleDecl(D));
if (auto *SuperD = D->getSuperClass()) {
TRY_TO(IndexCtx.handleReference(SuperD, D->getSuperClassLoc(), D, D,
SymbolRoleSet(),
SymbolRelation{(unsigned)SymbolRole::RelationBaseOf, D}));
}
TRY_TO(handleReferencedProtocols(D->getReferencedProtocols(), D));
TRY_TO(IndexCtx.indexDeclContext(D));
} else {
return IndexCtx.handleReference(D, D->getLocation(), nullptr, nullptr,
SymbolRoleSet());
@ -210,9 +235,9 @@ public:
bool VisitObjCProtocolDecl(const ObjCProtocolDecl *D) {
if (D->isThisDeclarationADefinition()) {
if (!IndexCtx.handleDecl(D))
return false;
IndexCtx.indexDeclContext(D);
TRY_TO(IndexCtx.handleDecl(D));
TRY_TO(handleReferencedProtocols(D->getReferencedProtocols(), D));
TRY_TO(IndexCtx.indexDeclContext(D));
} else {
return IndexCtx.handleReference(D, D->getLocation(), nullptr, nullptr,
SymbolRoleSet());

20
clang/test/Index/Core/index-source.m
View File

@ -18,3 +18,23 @@ void goo(Base *b) {
// CHECK-NEXT: RelRec | Base | c:objc(cs)Base
[b meth];
}
// CHECK: [[@LINE+1]]:11 | objc-protocol/ObjC | Prot1 | c:objc(pl)Prot1 | <no-cgname> | Decl | rel: 0
@protocol Prot1
@end
// CHECK: [[@LINE+3]]:11 | objc-protocol/ObjC | Prot2 | c:objc(pl)Prot2 | <no-cgname> | Decl | rel: 0
// CHECK: [[@LINE+2]]:17 | objc-protocol/ObjC | Prot1 | c:objc(pl)Prot1 | <no-cgname> | Ref,RelBase | rel: 1
// CHECK-NEXT: RelBase | Prot2 | c:objc(pl)Prot2
@protocol Prot2<Prot1>
@end
// CHECK: [[@LINE+7]]:12 | objc-class/ObjC | Sub | c:objc(cs)Sub | _OBJC_CLASS_$_Sub | Decl | rel: 0
// CHECK: [[@LINE+6]]:18 | objc-class/ObjC | Base | c:objc(cs)Base | _OBJC_CLASS_$_Base | Ref,RelBase | rel: 1
// CHECK-NEXT: RelBase | Sub | c:objc(cs)Sub
// CHECK: [[@LINE+4]]:23 | objc-protocol/ObjC | Prot2 | c:objc(pl)Prot2 | <no-cgname> | Ref,RelBase | rel: 1
// CHECK-NEXT: RelBase | Sub | c:objc(cs)Sub
// CHECK: [[@LINE+2]]:30 | objc-protocol/ObjC | Prot1 | c:objc(pl)Prot1 | <no-cgname> | Ref,RelBase | rel: 1
// CHECK-NEXT: RelBase | Sub | c:objc(cs)Sub
@interface Sub : Base<Prot2, Prot1>
@end