[libclang] Indexing API: provide an attribute list inside CXIdxEntityInfo
so that we can access the attributes of an entity for a reference.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146616 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/libclang/IndexingContext.cpp b/tools/libclang/IndexingContext.cpp
index 8d27d85..23d8e7e 100644
--- a/tools/libclang/IndexingContext.cpp
+++ b/tools/libclang/IndexingContext.cpp
@@ -22,7 +22,7 @@
IndexingContext::ObjCProtocolListInfo::ObjCProtocolListInfo(
const ObjCProtocolList &ProtList,
IndexingContext &IdxCtx,
- StrAdapter &SA) {
+ ScratchAlloc &SA) {
ObjCInterfaceDecl::protocol_loc_iterator LI = ProtList.loc_begin();
for (ObjCInterfaceDecl::protocol_iterator
I = ProtList.begin(), E = ProtList.end(); I != E; ++I, ++LI) {
@@ -46,9 +46,27 @@
Prots.push_back(&ProtInfos[i]);
}
-IndexingContext::AttrListInfo::AttrListInfo(const Decl *D,
- IndexingContext &IdxCtx,
- StrAdapter &SA) {
+
+IBOutletCollectionInfo::IBOutletCollectionInfo(
+ const IBOutletCollectionInfo &other)
+ : AttrInfo(CXIdxAttr_IBOutletCollection, other.cursor, other.loc, A) {
+
+ IBCollInfo.attrInfo = this;
+ IBCollInfo.classCursor = other.IBCollInfo.classCursor;
+ IBCollInfo.classLoc = other.IBCollInfo.classLoc;
+ if (other.IBCollInfo.objcClass) {
+ ClassInfo = other.ClassInfo;
+ IBCollInfo.objcClass = &ClassInfo;
+ } else
+ IBCollInfo.objcClass = 0;
+}
+
+AttrListInfo::AttrListInfo(const Decl *D,
+ IndexingContext &IdxCtx,
+ ScratchAlloc &SA) : ref_cnt(0) {
+ if (!D->hasAttrs())
+ return;
+
for (AttrVec::const_iterator AttrI = D->attr_begin(), AttrE = D->attr_end();
AttrI != AttrE; ++AttrI) {
const Attr *A = *AttrI;
@@ -95,9 +113,24 @@
CXAttrs.push_back(&Attrs[i]);
}
+AttrListInfo::AttrListInfo(const AttrListInfo &other) {
+ assert(other.ref_cnt == 0 &&
+ "Should not copy an AttrListInfo that is ref-counted");
+ ref_cnt = 0;
+
+ Attrs = other.Attrs;
+ IBCollAttrs = other.IBCollAttrs;
+
+ for (unsigned i = 0, e = IBCollAttrs.size(); i != e; ++i)
+ CXAttrs.push_back(&IBCollAttrs[i]);
+
+ for (unsigned i = 0, e = Attrs.size(); i != e; ++i)
+ CXAttrs.push_back(&Attrs[i]);
+}
+
IndexingContext::CXXBasesListInfo::CXXBasesListInfo(const CXXRecordDecl *D,
IndexingContext &IdxCtx,
- IndexingContext::StrAdapter &SA) {
+ ScratchAlloc &SA) {
for (CXXRecordDecl::base_class_const_iterator
I = D->bases_begin(), E = D->bases_end(); I != E; ++I) {
const CXXBaseSpecifier &Base = *I;
@@ -155,7 +188,7 @@
return Loc;
}
-const char *IndexingContext::StrAdapter::toCStr(StringRef Str) {
+const char *ScratchAlloc::toCStr(StringRef Str) {
if (Str.empty())
return "";
if (Str.data()[Str.size()] == '\0')
@@ -163,7 +196,7 @@
return copyCStr(Str);
}
-const char *IndexingContext::StrAdapter::copyCStr(StringRef Str) {
+const char *ScratchAlloc::copyCStr(StringRef Str) {
char *buf = IdxCtx.StrScratch.Allocate<char>(Str.size() + 1);
std::uninitialized_copy(Str.begin(), Str.end(), buf);
buf[Str.size()] = '\0';
@@ -195,7 +228,7 @@
if (!CB.ppIncludedFile)
return;
- StrAdapter SA(*this);
+ ScratchAlloc SA(*this);
CXIdxIncludedFileInfo Info = { getIndexLoc(hashLoc),
SA.toCStr(filename),
(CXFile)File,
@@ -226,7 +259,7 @@
if (D->isImplicit() && shouldIgnoreIfImplicit(D))
return false;
- StrAdapter SA(*this);
+ ScratchAlloc SA(*this);
getEntityInfo(D, DInfo.EntInfo, SA);
if (!DInfo.EntInfo.USR || Loc.isInvalid())
return false;
@@ -320,7 +353,7 @@
}
bool IndexingContext::handleObjCInterface(const ObjCInterfaceDecl *D) {
- StrAdapter SA(*this);
+ ScratchAlloc SA(*this);
CXIdxBaseClassInfo BaseClass;
EntityInfo BaseEntity;
@@ -366,7 +399,7 @@
}
bool IndexingContext::handleObjCProtocol(const ObjCProtocolDecl *D) {
- StrAdapter SA(*this);
+ ScratchAlloc SA(*this);
ObjCProtocolListInfo ProtListInfo(D->getReferencedProtocols(), *this, SA);
ObjCProtocolDeclInfo ProtInfo(D);
@@ -378,7 +411,7 @@
bool IndexingContext::handleObjCCategory(const ObjCCategoryDecl *D) {
ObjCCategoryDeclInfo CatDInfo(/*isImplementation=*/false);
EntityInfo ClassEntity;
- StrAdapter SA(*this);
+ ScratchAlloc SA(*this);
const ObjCInterfaceDecl *IFaceD = D->getClassInterface();
SourceLocation ClassLoc = D->getLocation();
SourceLocation CategoryLoc = D->IsClassExtension() ? ClassLoc
@@ -410,7 +443,7 @@
const ObjCCategoryDecl *CatD = D->getCategoryDecl();
ObjCCategoryDeclInfo CatDInfo(/*isImplementation=*/true);
EntityInfo ClassEntity;
- StrAdapter SA(*this);
+ ScratchAlloc SA(*this);
const ObjCInterfaceDecl *IFaceD = CatD->getClassInterface();
SourceLocation ClassLoc = D->getLocation();
SourceLocation CategoryLoc = D->getCategoryNameLoc();
@@ -519,7 +552,7 @@
return false; // already occurred.
}
- StrAdapter SA(*this);
+ ScratchAlloc SA(*this);
EntityInfo RefEntity, ParentEntity;
getEntityInfo(D, RefEntity, SA);
if (!RefEntity.USR)
@@ -586,7 +619,7 @@
bool IndexingContext::handleCXXRecordDecl(const CXXRecordDecl *RD,
const NamedDecl *OrigD) {
if (RD->isThisDeclarationADefinition()) {
- StrAdapter SA(*this);
+ ScratchAlloc SA(*this);
CXXClassDeclInfo CXXDInfo(/*isRedeclaration=*/!OrigD->isCanonicalDecl(),
/*isDefinition=*/RD->isThisDeclarationADefinition());
CXXBasesListInfo BaseList(RD, *this, SA);
@@ -731,7 +764,7 @@
void IndexingContext::getEntityInfo(const NamedDecl *D,
EntityInfo &EntityInfo,
- StrAdapter &SA) {
+ ScratchAlloc &SA) {
if (!D)
return;
@@ -743,6 +776,14 @@
EntityInfo.templateKind = CXIdxEntity_NonTemplate;
EntityInfo.lang = CXIdxEntityLang_C;
+ if (D->hasAttrs()) {
+ AttrListInfo *attrs = SA.allocate<AttrListInfo>();
+ new (attrs) AttrListInfo(D, *this, SA);
+ EntityInfo.AttrList = attrs;
+ EntityInfo.attributes = attrs->getAttrs();
+ EntityInfo.numAttributes = attrs->getNumAttrs();
+ }
+
if (const TagDecl *TD = dyn_cast<TagDecl>(D)) {
switch (TD->getTagKind()) {
case TTK_Struct: