replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix uninitialized memory access when the token 'const' is not present in 

the program.

If the token is not there, we still warn but we don't try to give a
fixit hint.

llvm-svn: 271426
This commit is contained in:
Samuel Benzaquen 2016-06-01 20:37:23 +00:00
parent 5573483c5b
commit aa05ae91fb
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clang-tools-extra/clang-tidy/readability/AvoidConstParamsInDecls.cpp
View File

@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
#include "AvoidConstParamsInDecls.h"
#include "llvm/ADT/Optional.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Lex/Lexer.h"
@ -38,8 +39,8 @@ void AvoidConstParamsInDecls::registerMatchers(MatchFinder *Finder) {
}
// Re-lex the tokens to get precise location of last 'const'
static Token ConstTok(CharSourceRange Range,
const MatchFinder::MatchResult &Result) {
static llvm::Optional<Token> ConstTok(CharSourceRange Range,
const MatchFinder::MatchResult &Result) {
const SourceManager &Sources = *Result.SourceManager;
std::pair<FileID, unsigned> LocInfo =
Sources.getDecomposedLoc(Range.getBegin());
@ -49,7 +50,7 @@ static Token ConstTok(CharSourceRange Range,
Result.Context->getLangOpts(), File.begin(), TokenBegin,
File.end());
Token Tok;
Token ConstTok;
llvm::Optional<Token> ConstTok;
while (!RawLexer.LexFromRawLexer(Tok)) {
if (Sources.isBeforeInTranslationUnit(Range.getEnd(), Tok.getLocation()))
break;
@ -94,9 +95,11 @@ void AvoidConstParamsInDecls::check(const MatchFinder::MatchResult &Result) {
if (!FileRange.isValid())
return;
Token Tok = ConstTok(FileRange, Result);
auto Tok = ConstTok(FileRange, Result);
if (!Tok)
return;
Diag << FixItHint::CreateRemoval(
CharSourceRange::getTokenRange(Tok.getLocation(), Tok.getLocation()));
CharSourceRange::getTokenRange(Tok->getLocation(), Tok->getLocation()));
}
} // namespace readability

7
clang-tools-extra/test/clang-tidy/readability-avoid-const-params-in-decls.cpp
View File

@ -83,3 +83,10 @@ void NF(const int&);
void NF(const int*);
void NF(const int* const*);
void NF(alias_const_type);
// Regression test for when the 'const' token is not in the code.
#define CONCAT(a, b) a##b
void ConstNotVisible(CONCAT(cons, t) int i);
// CHECK-MESSAGES: :[[@LINE-1]]:22: warning: parameter 'i'
// We warn, but we can't give a fix
// CHECK-FIXES: void ConstNotVisible(CONCAT(cons, t) int i);