forked from OSchip/llvm-project
[clang] Mark re-injected tokens appropriately during pragma handling
This hides such tokens from TokenWatcher, preventing crashes in clients trying to match spelled and expanded tokens. Fixes https://github.com/clangd/clangd/issues/712 Differential Revision: https://reviews.llvm.org/D98483
This commit is contained in:
parent
0bd9d9aa3c
commit
f43ff34ae6
|
@ -14,11 +14,13 @@
|
|||
#include "clang/Basic/PragmaKinds.h"
|
||||
#include "clang/Basic/TargetInfo.h"
|
||||
#include "clang/Lex/Preprocessor.h"
|
||||
#include "clang/Lex/Token.h"
|
||||
#include "clang/Parse/LoopHint.h"
|
||||
#include "clang/Parse/ParseDiagnostic.h"
|
||||
#include "clang/Parse/Parser.h"
|
||||
#include "clang/Parse/RAIIObjectsForParser.h"
|
||||
#include "clang/Sema/Scope.h"
|
||||
#include "llvm/ADT/ArrayRef.h"
|
||||
#include "llvm/ADT/StringSwitch.h"
|
||||
using namespace clang;
|
||||
|
||||
|
@ -292,6 +294,10 @@ struct PragmaMaxTokensTotalHandler : public PragmaHandler {
|
|||
Token &FirstToken) override;
|
||||
};
|
||||
|
||||
void markAsReinjectedForRelexing(llvm::MutableArrayRef<clang::Token> Toks) {
|
||||
for (auto &T : Toks)
|
||||
T.setFlag(clang::Token::IsReinjected);
|
||||
}
|
||||
} // end namespace
|
||||
|
||||
void Parser::initializePragmaHandlers() {
|
||||
|
@ -2619,6 +2625,7 @@ void PragmaMSPragma::HandlePragma(Preprocessor &PP,
|
|||
TokenVector.push_back(EoF);
|
||||
// We must allocate this array with new because EnterTokenStream is going to
|
||||
// delete it later.
|
||||
markAsReinjectedForRelexing(TokenVector);
|
||||
auto TokenArray = std::make_unique<Token[]>(TokenVector.size());
|
||||
std::copy(TokenVector.begin(), TokenVector.end(), TokenArray.get());
|
||||
auto Value = new (PP.getPreprocessorAllocator())
|
||||
|
@ -3176,6 +3183,7 @@ static bool ParseLoopHintValue(Preprocessor &PP, Token &Tok, Token PragmaName,
|
|||
EOFTok.setLocation(Tok.getLocation());
|
||||
ValueList.push_back(EOFTok); // Terminates expression for parsing.
|
||||
|
||||
markAsReinjectedForRelexing(ValueList);
|
||||
Info.Toks = llvm::makeArrayRef(ValueList).copy(PP.getPreprocessorAllocator());
|
||||
|
||||
Info.PragmaName = PragmaName;
|
||||
|
@ -3632,6 +3640,7 @@ void PragmaAttributeHandler::HandlePragma(Preprocessor &PP,
|
|||
EOFTok.setLocation(EndLoc);
|
||||
AttributeTokens.push_back(EOFTok);
|
||||
|
||||
markAsReinjectedForRelexing(AttributeTokens);
|
||||
Info->Tokens =
|
||||
llvm::makeArrayRef(AttributeTokens).copy(PP.getPreprocessorAllocator());
|
||||
}
|
||||
|
|
|
@ -1037,4 +1037,13 @@ TEST_F(TokenBufferTest, ExpandedBySpelled) {
|
|||
IsEmpty());
|
||||
}
|
||||
|
||||
TEST_F(TokenCollectorTest, Pragmas) {
|
||||
// Tokens coming from concatenations.
|
||||
recordTokens(R"cpp(
|
||||
void foo() {
|
||||
#pragma unroll 4
|
||||
for(int i=0;i<4;++i);
|
||||
}
|
||||
)cpp");
|
||||
}
|
||||
} // namespace
|
||||
|
|
Loading…
Reference in New Issue