2 files changed, 20 insertions, 3 deletions
diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c
index 1370e21c81..fdc88a015e 100644
--- a/tools/c-index-test/c-index-test.c
+++ b/tools/c-index-test/c-index-test.c
@@ -1580,6 +1580,10 @@ static void printCXIndexLoc(CXIdxLoc loc) {
     printf("<null loc>");
     return;
   }
+  if (!file) {
+    printf("<no idxfile>");
+    return;
+  }
   filename = clang_getFileName((CXFile)file);
   cname = clang_getCString(filename);
   end = cname + strlen(cname);
@@ -1694,9 +1698,9 @@ static void printEntityInfo(const char *cb,
 
   printf("%s: kind: %s%s", cb, getEntityKindString(info->kind),
          getEntityTemplateKindString(info->templateKind));
-  printf(" | lang: %s", getEntityLanguageString(info->lang));
   printf(" | name: %s", name);
   printf(" | USR: %s", info->USR);
+  printf(" | lang: %s", getEntityLanguageString(info->lang));
 }
 
 static void printBaseClassInfo(CXClientData client_data,
diff --git a/tools/libclang/IndexingContext.cpp b/tools/libclang/IndexingContext.cpp
index b95d22d010..66e552c8f4 100644
--- a/tools/libclang/IndexingContext.cpp
+++ b/tools/libclang/IndexingContext.cpp
@@ -228,7 +228,8 @@ bool IndexingContext::handleDecl(const NamedDecl *D,
   if (!DInfo.EntInfo.USR || Loc.isInvalid())
     return false;
 
-  markEntityOccurrenceInFile(D, Loc);
+  if (suppressRefs())
+    markEntityOccurrenceInFile(D, Loc);
   
   DInfo.entityInfo = &DInfo.EntInfo;
   DInfo.cursor = Cursor;
@@ -304,6 +305,12 @@ bool IndexingContext::handleObjCClass(const ObjCClassDecl *D) {
   SourceLocation Loc = Ref->getLocation();
   bool isRedeclaration = IFaceD->getLocation() != Loc;
  
+  // For @class forward declarations, suppress them the same way as references.
+  if (suppressRefs()) {
+    if (markEntityOccurrenceInFile(IFaceD, Loc))
+      return false; // already occurred.
+  }
+
   ObjCContainerDeclInfo ContDInfo(/*isForwardRef=*/true, isRedeclaration,
                                   /*isImplementation=*/false);
   return handleObjCContainer(IFaceD, Loc,
@@ -373,6 +380,9 @@ bool IndexingContext::handleObjCCategory(const ObjCCategoryDecl *D) {
                                                      : D->getCategoryNameLoc();
   getEntityInfo(IFaceD, ClassEntity, SA);
 
+  if (suppressRefs())
+    markEntityOccurrenceInFile(IFaceD, ClassLoc);
+
   CatDInfo.ObjCCatDeclInfo.containerInfo = &CatDInfo.ObjCContDeclInfo;
   if (IFaceD) {
     CatDInfo.ObjCCatDeclInfo.objcClass = &ClassEntity;
@@ -583,10 +593,13 @@ bool IndexingContext::handleCXXRecordDecl(const CXXRecordDecl *RD,
 
 bool IndexingContext::markEntityOccurrenceInFile(const NamedDecl *D,
                                                  SourceLocation Loc) {
+  if (!D || Loc.isInvalid())
+    return true;
+
   SourceManager &SM = Ctx->getSourceManager();
   D = getEntityDecl(D);
   
-  std::pair<FileID, unsigned> LocInfo = SM.getDecomposedLoc(Loc);
+  std::pair<FileID, unsigned> LocInfo = SM.getDecomposedLoc(SM.getFileLoc(Loc));
   FileID FID = LocInfo.first;
   if (FID.isInvalid())
     return true;