Handle source ranges where isTokenRange() == true (the end of this range specifies the start of the last token). In this case, compute the source location just past the end of the token at this source location. Fix the test. The end column is not exclusive.

Author: VitaNuo

clang/lib/Frontend/FrontendAction.cpp

@@ -130,8 +130,12 @@ class DeserializedDeclsLineRangePrinter : public ASTConsumer,
       if (!R.isValid())
         continue;
 
+      SourceLocation End = R.getEnd();
+      if (R.isTokenRange())
+        End = Lexer::getLocForEndOfToken(End, 0, SM, D->getLangOpts());
+
       auto *F = SM.getFileEntryForID(SM.getFileID(R.getBegin()));
-      if (F != SM.getFileEntryForID(SM.getFileID(R.getEnd()))) {
+      if (F != SM.getFileEntryForID(SM.getFileID(End))) {
         // Such cases are rare and difficult to handle.
         continue;
       }
@@ -140,7 +144,7 @@ class DeserializedDeclsLineRangePrinter : public ASTConsumer,
       if (!Data.Ref)
         Data.Ref = SM.getFileEntryRefForID(SM.getFileID(R.getBegin()));
       Data.FromTo.push_back({Position::GetSpelling(SM, R.getBegin()),
-                             Position::GetSpelling(SM, R.getEnd())});
+                             Position::GetSpelling(SM, End)});
     }
 
     // To simplify output, merge consecutive and intersecting ranges.

clang/test/Frontend/dump-deserialized-declaration-ranges.cpp

@@ -3,6 +3,7 @@
 // RUN: split-file %s %t
 // RUN: %clang_cc1 -xc++ -fmodules -fmodule-name=foo -fmodule-map-file=%t/foo.cppmap -emit-module %t/foo.cppmap -o %t/foo.pcm
 // RUN: %clang_cc1 -xc++ -fmodules -dump-deserialized-declaration-ranges=%t/decls -fmodule-file=%t/foo.pcm %t/foo.cpp -o %t/foo.o
+// RUN: cat %t/decls
 // RUN: cat %t/decls | FileCheck -check-prefix=RANGE %s
 // RANGE:{
 // RANGE-NEXT:  "required_ranges": [
@@ -16,7 +17,7 @@
 // RANGE-NEXT:          },
 // RANGE-NEXT:          "to": {
 // RANGE-NEXT:            "line": 9,
-// RANGE-NEXT:            "column": 1
+// RANGE-NEXT:            "column": 2
 // RANGE-NEXT:          }
 // RANGE-NEXT:        },
 // RANGE-NEXT:        {
@@ -26,7 +27,7 @@
 // RANGE-NEXT:          },
 // RANGE-NEXT:          "to": {
 // RANGE-NEXT:            "line": 11,
-// RANGE-NEXT:            "column": 12
+// RANGE-NEXT:            "column": 24
 // RANGE-NEXT:          }
 // RANGE-NEXT:        },
 // RANGE-NEXT:        {
@@ -36,7 +37,7 @@
 // RANGE-NEXT:          },
 // RANGE-NEXT:          "to": {
 // RANGE-NEXT:            "line": 15,
-// RANGE-NEXT:            "column": 1
+// RANGE-NEXT:            "column": 2
 // RANGE-NEXT:          }
 // RANGE-NEXT:        }
 // RANGE-NEXT:      ]