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

Revert "[Diagnostic] Add ftabstop to -Wmisleading-indentation" 

This reverts commit b47b35ff51.

This caused failed asserts (Assertion `FIDAndOffset.second >
ColNo && "Column number smaller than file offset?"' failed.)
on a source file with a single line containing
"int main (void) { for( int i = 0; i < 9; i++ ); return 0; }".
This commit is contained in:
Martin Storsjö 2019-12-31 21:38:43 +02:00
parent 79d401905f
commit b65ca8e5db
2 changed files with 5 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1214,41 +1214,6 @@ struct MisleadingIndentationChecker {
if (Kind == MSK_else && !ShouldSkip) if (Kind == MSK_else && !ShouldSkip)
P.MisleadingIndentationElseLoc = SL; P.MisleadingIndentationElseLoc = SL;
} }
/// Compute the column number will aligning tabs on TabStop (-ftabstop), this
/// gives the visual indentation of the SourceLocation.
static unsigned getVisualIndentation(SourceManager &SM, SourceLocation Loc) {
unsigned TabStop = SM.getDiagnostics().getDiagnosticOptions().TabStop;
unsigned ColNo = SM.getSpellingColumnNumber(Loc);
if (ColNo == 0 || TabStop == 1)
return ColNo;
std::pair<FileID, unsigned> FIDAndOffset = SM.getDecomposedLoc(Loc);
bool Invalid;
StringRef BufData = SM.getBufferData(FIDAndOffset.first, &Invalid);
if (Invalid)
return 0;
const char *EndPos = BufData.data() + FIDAndOffset.second;
assert(FIDAndOffset.second > ColNo &&
"Column number smaller than file offset?");
unsigned VisualColumn = 0; // Stored as 0-based column, here.
// Loop from beginning of line up to Loc's file position, counting columns,
// expanding tabs.
for (const char *CurPos = EndPos - (ColNo - 1); CurPos != EndPos;
++CurPos) {
if (*CurPos == '\t')
// Advance visual column to next tabstop.
VisualColumn += (TabStop - VisualColumn % TabStop);
else
VisualColumn++;
}
return VisualColumn + 1;
}
void Check() { void Check() {
Token Tok = P.getCurToken(); Token Tok = P.getCurToken();
if (P.getActions().getDiagnostics().isIgnored( if (P.getActions().getDiagnostics().isIgnored(
@ -1265,9 +1230,9 @@ struct MisleadingIndentationChecker {
P.MisleadingIndentationElseLoc = SourceLocation(); P.MisleadingIndentationElseLoc = SourceLocation();
SourceManager &SM = P.getPreprocessor().getSourceManager(); SourceManager &SM = P.getPreprocessor().getSourceManager();
unsigned PrevColNum = getVisualIndentation(SM, PrevLoc); unsigned PrevColNum = SM.getSpellingColumnNumber(PrevLoc);
unsigned CurColNum = getVisualIndentation(SM, Tok.getLocation()); unsigned CurColNum = SM.getSpellingColumnNumber(Tok.getLocation());
unsigned StmtColNum = getVisualIndentation(SM, StmtLoc); unsigned StmtColNum = SM.getSpellingColumnNumber(StmtLoc);
if (PrevColNum != 0 && CurColNum != 0 && StmtColNum != 0 && if (PrevColNum != 0 && CurColNum != 0 && StmtColNum != 0 &&
((PrevColNum > StmtColNum && PrevColNum == CurColNum) || ((PrevColNum > StmtColNum && PrevColNum == CurColNum) ||

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

@ -1,9 +1,7 @@
// RUN: %clang_cc1 -x c -fsyntax-only -verify %s // RUN: %clang_cc1 -x c -fsyntax-only -verify %s
// RUN: %clang_cc1 -x c -fsyntax-only -verify -Wmisleading-indentation -DWITH_WARN %s
// RUN: %clang_cc1 -std=c++17 -fsyntax-only -verify -Wall -Wno-unused -DWITH_WARN -DCXX17 %s
// RUN: %clang_cc1 -std=c++17 -fsyntax-only -verify -Wall -Wno-unused -Wno-misleading-indentation -DCXX17 %s // RUN: %clang_cc1 -std=c++17 -fsyntax-only -verify -Wall -Wno-unused -Wno-misleading-indentation -DCXX17 %s
// RUN: %clang_cc1 -x c -fsyntax-only -verify -Wmisleading-indentation -DWITH_WARN -ftabstop 8 -DTAB_SIZE=8 %s
// RUN: %clang_cc1 -std=c++17 -fsyntax-only -verify -Wall -Wno-unused -DWITH_WARN -ftabstop 4 -DTAB_SIZE=4 -DCXX17 %s
// RUN: %clang_cc1 -x c -fsyntax-only -verify -Wall -Wno-unused -DWITH_WARN -ftabstop 1 -DTAB_SIZE=1 %s
// RUN: %clang_cc1 -std=c++17 -fsyntax-only -verify -Wall -Wno-unused -Wmisleading-indentation -DCXX17 -DWITH_WARN -ftabstop 2 -DTAB_SIZE=2 %s
#ifndef WITH_WARN #ifndef WITH_WARN
// expected-no-diagnostics // expected-no-diagnostics
@ -227,80 +225,3 @@ void s(int num) {
// expected-warning@-2 {{misleading indentation; statement is not part of the previous 'if'}} // expected-warning@-2 {{misleading indentation; statement is not part of the previous 'if'}}
#endif #endif
} }
int a4()
{
if (0)
return 1;
return 0;
#if (TAB_SIZE == 1)
// expected-warning@-2 {{misleading indentation; statement is not part of the previous 'if'}}
// expected-note@-5 {{here}}
#endif
}
int a5()
{
if (0)
return 1;
return 0;
#if WITH_WARN
// expected-warning@-2 {{misleading indentation; statement is not part of the previous 'if'}}
// expected-note@-5 {{here}}
#endif
}
int a6()
{
if (0)
return 1;
return 0;
#if (TAB_SIZE == 8)
// expected-warning@-2 {{misleading indentation; statement is not part of the previous 'if'}}
// expected-note@-5 {{here}}
#endif
}
#define FOO \
goto fail
int main(int argc, char* argv[]) {
if (5 != 0)
goto fail;
else
goto fail;
if (1) {
if (1)
goto fail;
else if (1)
goto fail;
else if (1)
goto fail;
else
goto fail;
} else if (1) {
if (1)
goto fail;
}
if (1) {
if (1)
goto fail;
} else if (1)
goto fail;
if (1) goto fail; goto fail;
if (0)
goto fail;
goto fail;
if (0)
FOO;
goto fail;
fail:;
}