Change begin of macro in translateSourceRange in libclang

[quic-cbusold]

Summary

Currently translateSourceRange changes the end location in case of
a macro. When getting the source location for a macro invocation
it therefore returns the beginning of the macro definition with
the end of the macro invocation (with everything inbetween). This
change makes it return only the location of the macro invocation.

[quic-cbusold]

This does not work. Need more debugging on my end.

clang/tools/libclang/CIndex.cpp

 /// start of the token at the end. However, for external clients it is more
 /// useful to have a CXSourceRange be a proper half-open interval. This routine
 /// does the appropriate translation.
 CXSourceRange cxloc::translateSourceRange(const SourceManager &SM,
                                           const LangOptions &LangOpts,
                                           const CharSourceRange &R) {
   // We want the last character in this location, so we will adjust the
   // location accordingly.
+  SourceLocation BeginLoc = R.getBegin();
   SourceLocation EndLoc = R.getEnd();
   bool IsTokenRange = R.isTokenRange();
   if (EndLoc.isValid() && EndLoc.isMacroID() &&
       !SM.isMacroArgExpansion(EndLoc)) {
     CharSourceRange Expansion = SM.getExpansionRange(EndLoc);
+    BeginLoc = Expansion.getBegin();
     EndLoc = Expansion.getEnd();
     IsTokenRange = Expansion.isTokenRange();
   }
   if (IsTokenRange && EndLoc.isValid()) {
     unsigned Length =
         Lexer::MeasureTokenLength(SM.getSpellingLoc(EndLoc), SM, LangOpts);
     EndLoc = EndLoc.getLocWithOffset(Length);
   }
 
   CXSourceRange Result = {
-      {&SM, &LangOpts}, R.getBegin().getRawEncoding(), EndLoc.getRawEncoding()};
+      {&SM, &LangOpts}, BeginLoc.getRawEncoding(), EndLoc.getRawEncoding()};
   return Result;
 }
 
 CharSourceRange cxloc::translateCXRangeToCharRange(CXSourceRange R) {
   return CharSourceRange::getCharRange(
       SourceLocation::getFromRawEncoding(R.begin_int_data),
       SourceLocation::getFromRawEncoding(R.end_int_data));
 }