2 files changed, 3 insertions, 4 deletions
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index a0f6f686d6c..9c057e5520c 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -1065,7 +1065,7 @@ bool CursorVisitor::VisitObjCForwardProtocolDecl(ObjCForwardProtocolDecl *D) {
 
 bool CursorVisitor::VisitObjCClassDecl(ObjCClassDecl *D) {
   if (Visit(MakeCursorObjCClassRef(D->getForwardInterfaceDecl(), 
-                                   D->getForwardDecl()->getLocation(), TU)))
+                                   D->getNameLoc(), TU)))
       return true;
   return false;
 }
diff --git a/clang/tools/libclang/IndexingContext.cpp b/clang/tools/libclang/IndexingContext.cpp
index 812669397d4..a2480ba092c 100644
--- a/clang/tools/libclang/IndexingContext.cpp
+++ b/clang/tools/libclang/IndexingContext.cpp
@@ -300,9 +300,8 @@ bool IndexingContext::handleTypedefName(const TypedefNameDecl *D) {
 }
 
 bool IndexingContext::handleObjCClass(const ObjCClassDecl *D) {
-  const ObjCClassDecl::ObjCClassRef *Ref = D->getForwardDecl();
-  ObjCInterfaceDecl *IFaceD = Ref->getInterface();
-  SourceLocation Loc = Ref->getLocation();
+  ObjCInterfaceDecl *IFaceD = D->getForwardInterfaceDecl();
+  SourceLocation Loc = D->getNameLoc();
   bool isRedeclaration = IFaceD->getLocation() != Loc;
  
   // For @class forward declarations, suppress them the same way as references.