commit e2f854ddd365e6837cef3e1a1b7621b32200fc71
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Fri Jul 15 22:27:18 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Fri Jul 15 22:27:18 2011 +0000
tree 752ec452f2ede08732d94cf6a0fe55ad0bad5dfd
parent 5b5402bbdadcf7d8e4aa83a803b6f33b03458c24

Revert r135304 and apply fix in clang_getCanonicalCursor per Doug's, Fariborz's comments.

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

tools/libclang/CIndex.cpp

diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index 756d570..6f001d5 100644
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -4141,8 +4141,13 @@
   if (!clang_isDeclaration(C.kind))
     return C;
   
-  if (Decl *D = getCursorDecl(C))
+  if (Decl *D = getCursorDecl(C)) {
+    if (ObjCImplDecl *ImplD = dyn_cast<ObjCImplDecl>(D))
+      if (ObjCInterfaceDecl *IFD = ImplD->getClassInterface())
+        return MakeCXCursor(IFD, getCursorTU(C));
+
     return MakeCXCursor(D->getCanonicalDecl(), getCursorTU(C));
+  }
   
   return C;
 }