[clang/CachedDiagnostics] Fix issue where macro argument expansions are not properly recorded

(cherry picked from commit 31a054b)

Author: akyrtzi

clang/include/clang/Basic/SourceManager.h

@@ -381,6 +381,11 @@ class ExpansionInfo {
                                        : ExpansionLocEnd;
   }
 
+  /// The actual value of \c ExpansionLocEnd, useful for serialization purposes.
+  SourceLocation getUnderlyingExpansionLocEnd() const {
+    return ExpansionLocEnd;
+  }
+
   bool isExpansionTokenRange() const { return ExpansionIsTokenRange; }
 
   CharSourceRange getExpansionLocRange() const {

clang/test/CAS/cached-diagnostics.c

@@ -70,3 +70,11 @@ PRAG("unknown2")
 void test(int x) {
   if (x=0) {}
 }
+
+#define DEPR _Pragma("GCC warning \"name is deprecated\"")
+#define PARAM "A" DEPR
+#define MAC(x) x
+
+void test2() {
+  (void)MAC(PARAM);
+}

clang/tools/driver/CachedDiagnostics.cpp

@@ -307,7 +307,7 @@ unsigned CachedDiagnosticSerializer::convertFileID(FileID FID,
     CachedEI.ExpansionStartLoc =
         convertLoc(FullSourceLoc(EI.getExpansionLocStart(), SM));
     CachedEI.ExpansionEndLoc =
-        convertLoc(FullSourceLoc(EI.getExpansionLocEnd(), SM));
+        convertLoc(FullSourceLoc(EI.getUnderlyingExpansionLocEnd(), SM));
     CachedEI.IsTokenRange = EI.isExpansionTokenRange();
     CachedEntry.Data = std::move(CachedEI);
   }

clang/tools/driver/cc1_main.cpp

@@ -22,7 +22,6 @@
 #include "clang/Driver/DriverDiagnostic.h"
 #include "clang/Driver/Options.h"
 #include "clang/Frontend/CASDependencyCollector.h"
-#include "clang/Frontend/ChainedDiagnosticConsumer.h"
 #include "clang/Frontend/CompileJobCacheKey.h"
 #include "clang/Frontend/CompileJobCacheResult.h"
 #include "clang/Frontend/CompilerInstance.h"