Commit 9c8cfa09 authored by Tyker's avatar Tyker
Browse files

[Diagnsotics] Small Improvement on -Wmisleading-indentation 

Reviewers: aaron.ballman

Reviewed By: aaron.ballman

Subscribers: xbolva00

Differential Revision: https://reviews.llvm.org/D71083
parent 021b613c

clang/lib/Parse/ParseStmt.cpp

+6 −4
Original line number Diff line number Diff line
@@ -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);

clang/test/Parser/warn-misleading-indentation.cpp

+20 −1
Original line number Diff line number Diff line
@@ -206,3 +206,22 @@ void a3(int i) { 
    }

    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

}