[index] Fix compile after merge

This is a minimal change to fix the build/tests; a change to actually
use the new macro support is forthcoming.

Author: benlangmuir

clang/lib/Index/ClangIndexRecordWriter.cpp

@@ -82,7 +82,9 @@ bool ClangIndexRecordWriter::writeRecord(StringRef Filename,
     for (auto &Rel : Occur.Relations)
       Related.push_back(writer::SymbolRelation{Rel.RelatedSymbol, Rel.Roles});
 
-    Impl.addOccurrence(Occur.Dcl, Occur.Roles, Line, Col, Related);
+    // FIXME: handle macro occurrence
+    if (auto *D = Occur.DeclOrMacro.dyn_cast<const Decl *>())
+      Impl.addOccurrence(D, Occur.Roles, Line, Col, Related);
   }
 
   PrintingPolicy Policy(Ctx.getLangOpts());

clang/lib/Index/IndexRecordHasher.cpp

@@ -157,7 +157,10 @@ class DeclHashVisitor : public ConstDeclVisitor<DeclHashVisitor, hash_code> {
 hash_code IndexRecordHasher::hashRecord(const FileIndexRecord &Record) {
   hash_code Hash = INITIAL_HASH;
   for (auto &Info : Record.getDeclOccurrencesSortedByOffset()) {
-    COMBINE_HASH(Info.Roles, Info.Offset, hash(Info.Dcl));
+    COMBINE_HASH(Info.Roles, Info.Offset);
+    if (auto *D = Info.DeclOrMacro.dyn_cast<const Decl *>()) {
+      COMBINE_HASH(hash(D));
+    }
     for (auto &Rel : Info.Relations) {
       COMBINE_HASH(hash(Rel.RelatedSymbol));
     }