diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-29 20:58:47 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-29 20:58:47 +0000 |
| commit | d1b6c770bea9b3da66c6c1eb9a7c483ed7e55c1e (patch) | |
| tree | fe0f8eccf127c346ac2e08e36ec2af95072f4458 /tools | |
| parent | 865493b10990f9932c79d135eef448ff418792ab (diff) | |
| download | src-d1b6c770bea9b3da66c6c1eb9a7c483ed7e55c1e.tar.gz src-d1b6c770bea9b3da66c6c1eb9a7c483ed7e55c1e.zip | |
Vendor import of clang release_40 branch r293443:vendor/clang/clang-release_40-r293443
Notes
Notes:
svn path=/vendor/clang/dist/; revision=312958
svn path=/vendor/clang/clang-release_40-r293443/; revision=312959; tag=vendor/clang/clang-release_40-r293443
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libclang/CXIndexDataConsumer.cpp | 7 | ||||
| -rw-r--r-- | tools/libclang/CXIndexDataConsumer.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/libclang/CXIndexDataConsumer.cpp b/tools/libclang/CXIndexDataConsumer.cpp index 1981cabbbe4c..cb8aebfd0c48 100644 --- a/tools/libclang/CXIndexDataConsumer.cpp +++ b/tools/libclang/CXIndexDataConsumer.cpp @@ -95,7 +95,7 @@ public: if (isa<ObjCImplDecl>(LexicalDC) && !D->isThisDeclarationADefinition()) DataConsumer.handleSynthesizedObjCMethod(D, DeclLoc, LexicalDC); else - DataConsumer.handleObjCMethod(D); + DataConsumer.handleObjCMethod(D, DeclLoc); return true; } @@ -801,7 +801,8 @@ bool CXIndexDataConsumer::handleObjCCategoryImpl(const ObjCCategoryImplDecl *D) return handleObjCContainer(D, CategoryLoc, getCursor(D), CatDInfo); } -bool CXIndexDataConsumer::handleObjCMethod(const ObjCMethodDecl *D) { +bool CXIndexDataConsumer::handleObjCMethod(const ObjCMethodDecl *D, + SourceLocation Loc) { bool isDef = D->isThisDeclarationADefinition(); bool isContainer = isDef; bool isSkipped = false; @@ -814,7 +815,7 @@ bool CXIndexDataConsumer::handleObjCMethod(const ObjCMethodDecl *D) { DeclInfo DInfo(!D->isCanonicalDecl(), isDef, isContainer); if (isSkipped) DInfo.flags |= CXIdxDeclFlag_Skipped; - return handleDecl(D, D->getLocation(), getCursor(D), DInfo); + return handleDecl(D, Loc, getCursor(D), DInfo); } bool CXIndexDataConsumer::handleSynthesizedObjCProperty( diff --git a/tools/libclang/CXIndexDataConsumer.h b/tools/libclang/CXIndexDataConsumer.h index 718a2a18b1b3..16162cb83f77 100644 --- a/tools/libclang/CXIndexDataConsumer.h +++ b/tools/libclang/CXIndexDataConsumer.h @@ -418,7 +418,7 @@ public: bool handleObjCCategory(const ObjCCategoryDecl *D); bool handleObjCCategoryImpl(const ObjCCategoryImplDecl *D); - bool handleObjCMethod(const ObjCMethodDecl *D); + bool handleObjCMethod(const ObjCMethodDecl *D, SourceLocation Loc); bool handleSynthesizedObjCProperty(const ObjCPropertyImplDecl *D); bool handleSynthesizedObjCMethod(const ObjCMethodDecl *D, SourceLocation Loc, |