maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Diagnsotics] Small Improvement on -Wmisleading-indentation 

Reviewers: aaron.ballman

Reviewed By: aaron.ballman

Subscribers: xbolva00

Differential Revision: https://reviews.llvm.org/D71083
This commit is contained in:
Tyker 2019-12-10 22:09:20 +01:00
parent 021b613cdc
commit 9c8cfa09d7
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Parse/ParseStmt.cpp
View File

@ -1201,13 +1201,12 @@ struct MisleadingIndentationChecker {
SourceLocation PrevLoc;
unsigned NumDirectives;
MisleadingStatementKind Kind;
bool NeedsChecking;
bool ShouldSkip;
MisleadingIndentationChecker(Parser &P, MisleadingStatementKind K,
SourceLocation SL)
: P(P), StmtLoc(SL), PrevLoc(P.getCurToken().getLocation()),
NumDirectives(P.getPreprocessor().getNumDirectives()), Kind(K),
NeedsChecking(true), ShouldSkip(P.getCurToken().is(tok::l_brace)) {
ShouldSkip(P.getCurToken().is(tok::l_brace)) {
if (!P.MisleadingIndentationElseLoc.isInvalid()) {
StmtLoc = P.MisleadingIndentationElseLoc;
P.MisleadingIndentationElseLoc = SourceLocation();
@ -1216,9 +1215,10 @@ struct MisleadingIndentationChecker {
P.MisleadingIndentationElseLoc = SL;
}
void Check() {
NeedsChecking = false;
Token Tok = P.getCurToken();
if (ShouldSkip || NumDirectives != P.getPreprocessor().getNumDirectives() ||
if (P.getActions().getDiagnostics().isIgnored(
diag::warn_misleading_indentation, Tok.getLocation()) ||
ShouldSkip || NumDirectives != P.getPreprocessor().getNumDirectives() ||
Tok.isOneOf(tok::semi, tok::r_brace) || Tok.isAnnotation() ||
Tok.getLocation().isMacroID() || PrevLoc.isMacroID() ||
StmtLoc.isMacroID() ||
@ -1226,6 +1226,8 @@ struct MisleadingIndentationChecker {
P.MisleadingIndentationElseLoc = SourceLocation();
return;
}
if (Kind == MSK_else)
P.MisleadingIndentationElseLoc = SourceLocation();
SourceManager &SM = P.getPreprocessor().getSourceManager();
unsigned PrevColNum = SM.getSpellingColumnNumber(PrevLoc);

21
clang/test/Parser/warn-misleading-indentation.cpp
View File

@ -205,4 +205,23 @@ void a3(int i) {
i = 4;
}
return;
}
}
void s(int num) {
{
if (1)
return;
else
return;
return;
}
if (0)
#ifdef WITH_WARN
// expected-note@-2 {{here}}
#endif
return;
return;
#ifdef WITH_WARN
// expected-warning@-2 {{misleading indentation; statement is not part of the previous 'if'}}
#endif
}