[PATCH] D99934: [clang][Syntax] Handle invalid source range in expandedTokens.

[Utkarsh Saxena via Phabricator via cfe-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGcd824a48cccb: [clang][Syntax] Handle invalid source range in expandedTokens. (authored by usaxena95).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D99934/new/

https://reviews.llvm.org/D99934

Files:
  clang/lib/Tooling/Syntax/Tokens.cpp


Index: clang/lib/Tooling/Syntax/Tokens.cpp
===================================================================
--- clang/lib/Tooling/Syntax/Tokens.cpp
+++ clang/lib/Tooling/Syntax/Tokens.cpp
@@ -189,11 +189,16 @@
     return;
   ExpandedTokIndex.reserve(ExpandedTokens.size());
   // Index ExpandedTokens for faster lookups by SourceLocation.
-  for (size_t I = 0, E = ExpandedTokens.size(); I != E; ++I)
-    ExpandedTokIndex[ExpandedTokens[I].location()] = I;
+  for (size_t I = 0, E = ExpandedTokens.size(); I != E; ++I) {
+    SourceLocation Loc = ExpandedTokens[I].location();
+    if (Loc.isValid())
+      ExpandedTokIndex[Loc] = I;
+  }
 }
 
 llvm::ArrayRef<syntax::Token> TokenBuffer::expandedTokens(SourceRange R) const {
+  if (R.isInvalid())
+    return {};
   if (!ExpandedTokIndex.empty()) {
     // Quick lookup if `R` is a token range.
     // This is a huge win since majority of the users use ranges provided by an
@@ -201,9 +206,12 @@
     const auto B = ExpandedTokIndex.find(R.getBegin());
     const auto E = ExpandedTokIndex.find(R.getEnd());
     if (B != ExpandedTokIndex.end() && E != ExpandedTokIndex.end()) {
+      const Token *L = ExpandedTokens.data() + B->getSecond();
       // Add 1 to End to make a half-open range.
-      return {ExpandedTokens.data() + B->getSecond(),
-              ExpandedTokens.data() + E->getSecond() + 1};
+      const Token *R = ExpandedTokens.data() + E->getSecond() + 1;
+      if (L > R)
+        return {};
+      return {L, R};
     }
   }
   // Slow case. Use `isBeforeInTranslationUnit` to binary search for the


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D99934.335759.patch
Type: text/x-patch
Size: 1580 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20210407/88d249bd/attachment.bin>