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

Revert r318456 "Issue -Wempty-body warnings for else blocks" 

This caused warnings also when the if or else comes from macros. There was an
attempt to fix this in r318556, but that introduced new problems and was
reverted. Reverting this too until the whole issue is sorted.

> This looks like it was just an oversight.
>
> Fixes http://llvm.org/pr35319
>
> git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@318456 91177308-0d34-0410-b5e6-96231b3b80d8

llvm-svn: 318667
This commit is contained in:
Hans Wennborg 2017-11-20 17:48:54 +00:00
parent 8e7018d92f
commit 59ad150939
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -8094,8 +8094,6 @@ def err_switch_incomplete_class_type : Error<
def warn_empty_if_body : Warning<
"if statement has empty body">, InGroup<EmptyBody>;
def warn_empty_else_body : Warning<
"else clause has empty body">, InGroup<EmptyBody>;
def warn_empty_for_body : Warning<
"for loop has empty body">, InGroup<EmptyBody>;
def warn_empty_range_based_for_body : Warning<

4
clang/lib/Sema/SemaStmt.cpp
View File

@ -527,9 +527,7 @@ Sema::ActOnIfStmt(SourceLocation IfLoc, bool IsConstexpr, Stmt *InitStmt,
CondExpr->getExprLoc()))
CommaVisitor(*this).Visit(CondExpr);
if (elseStmt)
DiagnoseEmptyStmtBody(ElseLoc, elseStmt, diag::warn_empty_else_body);
else
if (!elseStmt)
DiagnoseEmptyStmtBody(CondExpr->getLocEnd(), thenStmt,
diag::warn_empty_if_body);

20
clang/test/SemaCXX/warn-empty-body.cpp
View File

@ -238,26 +238,6 @@ void test6(int x, int y) {
}
}
void test_if_else(int x) {
if (x); // expected-warning{{if statement has empty body}} expected-note{{separate line}}
if (x)
; // no-warning
if (x)
; // no-warning
else
; // no-warning
if (x)
; // no-warning
else; // expected-warning{{else clause has empty body}} expected-note{{separate line}}
if (x)
; // no-warning
else EMPTY(x); // no-warning
}
void test_errors(int x) {
if (1)
aa; // expected-error{{use of undeclared identifier}}