shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[clang][Syntax] Handle invalid source range in expandedTokens.

Browse Source 
Differential Revision: https://reviews.llvm.org/D99934
This commit is contained in:
Utkarsh Saxena 2021-04-06 11:55:55 +02:00
parent 35bc7569f8
commit cd824a48cc
No known key found for this signature in database
GPG Key ID: 686AD7A0D10F6FE0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/lib/Tooling/Syntax/Tokens.cpp
View File

@ -189,11 +189,16 @@ void TokenBuffer::indexExpandedTokens() {
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 @@ llvm::ArrayRef<syntax::Token> TokenBuffer::expandedTokens(SourceRange R) const {
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