From: Argyrios Kyrtzidis <akyrtzi@gmail.com>
Date: Tue, 9 Feb 2016 19:07:07 +0000 (+0000)
Subject: [libclang] indexing: Have the semantic container of synthesized ObjC getter/setter... 
X-Git-Tag: llvmorg-3.9.0-rc1~14710
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af75b197363fd65d53e2d32773523d051656a7fa;p=platform%2Fupstream%2Fllvm.git

[libclang] indexing: Have the semantic container of synthesized ObjC getter/setter methods be the implementation decl.

Matches the behavior of other ObjC methods.

llvm-svn: 260250
---

diff --git a/clang/tools/libclang/IndexingContext.cpp b/clang/tools/libclang/IndexingContext.cpp
index f7640c6..5d944ba 100644
--- a/clang/tools/libclang/IndexingContext.cpp
+++ b/clang/tools/libclang/IndexingContext.cpp
@@ -309,7 +309,8 @@ void IndexingContext::handleDiagnosticSet(CXDiagnostic CXDiagSet) {
 bool IndexingContext::handleDecl(const NamedDecl *D,
                                  SourceLocation Loc, CXCursor Cursor,
                                  DeclInfo &DInfo,
-                                 const DeclContext *LexicalDC) {
+                                 const DeclContext *LexicalDC,
+                                 const DeclContext *SemaDC) {
   if (!CB.indexDeclaration || !D)
     return false;
   if (D->isImplicit() && shouldIgnoreIfImplicit(D))
@@ -335,10 +336,12 @@ bool IndexingContext::handleDecl(const NamedDecl *D,
   DInfo.attributes = DInfo.EntInfo.attributes;
   DInfo.numAttributes = DInfo.EntInfo.numAttributes;
 
-  getContainerInfo(D->getDeclContext(), DInfo.SemanticContainer);
+  if (!SemaDC)
+    SemaDC = D->getDeclContext();
+  getContainerInfo(SemaDC, DInfo.SemanticContainer);
   DInfo.semanticContainer = &DInfo.SemanticContainer;
 
-  if (LexicalDC == D->getDeclContext()) {
+  if (LexicalDC == SemaDC) {
     DInfo.lexicalContainer = &DInfo.SemanticContainer;
   } else if (isTemplateImplicitInstantiation(D)) {
     // Implicit instantiations have the lexical context of where they were
@@ -598,7 +601,7 @@ bool IndexingContext::handleSynthesizedObjCMethod(const ObjCMethodDecl *D,
                                                  const DeclContext *LexicalDC) {
   DeclInfo DInfo(/*isRedeclaration=*/true, /*isDefinition=*/true,
                  /*isContainer=*/false);
-  return handleDecl(D, Loc, getCursor(D), DInfo, LexicalDC);
+  return handleDecl(D, Loc, getCursor(D), DInfo, LexicalDC, LexicalDC);
 }
 
 bool IndexingContext::handleObjCProperty(const ObjCPropertyDecl *D) {
diff --git a/clang/tools/libclang/IndexingContext.h b/clang/tools/libclang/IndexingContext.h
index 4da6aeb..2b1355a 100644
--- a/clang/tools/libclang/IndexingContext.h
+++ b/clang/tools/libclang/IndexingContext.h
@@ -468,7 +468,8 @@ private:
   bool handleDecl(const NamedDecl *D,
                   SourceLocation Loc, CXCursor Cursor,
                   DeclInfo &DInfo,
-                  const DeclContext *LexicalDC = nullptr);
+                  const DeclContext *LexicalDC = nullptr,
+                  const DeclContext *SemaDC = nullptr);
 
   bool handleObjCContainer(const ObjCContainerDecl *D,
                            SourceLocation Loc, CXCursor Cursor,