Author: hans
Date: Mon Nov 20 09:38:16 2017
New Revision: 318665
URL: http://llvm.org/viewvc/llvm-project?rev=318665&view=rev
Log:
Revert r318556 "Loosen -Wempty-body warning"
It seems this somehow made -Wempty-body fire in some macro cases where
it didn't before, e.g.
../../third_party/ffmpeg/libavcodec/bitstream.c(169,5): error: if statement
has empty body [-Werror,-Wempty-body]
ff_dlog(NULL, "new table index=%d size=%d\n", table_index, table_size);
^
../../third_party/ffmpeg\libavutil/internal.h(276,80): note: expanded from
macro 'ff_dlog'
# define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG,
__VA_ARGS__); } while (0)
^
../../third_party/ffmpeg/libavcodec/bitstream.c(169,5): note: put the
semicolon on a separate line to silence this warning
Reverting until this can be figured out.
> Do not show it when `if` or `else` come from macros.
> E.g.,
>
> #define USED(A) if (A); else
> #define SOME_IF(A) if (A)
>
> void test() {
> // No warnings are shown in those cases now.
> USED(0);
> SOME_IF(0);
> }
>
> Patch by Ilya Biryukov!
>
> Differential Revision: https://reviews.llvm.org/D40185
Modified:
cfe/trunk/include/clang/Sema/Sema.h
cfe/trunk/lib/Parse/ParseStmt.cpp
cfe/trunk/lib/Sema/SemaChecking.cpp
cfe/trunk/lib/Sema/SemaStmt.cpp
cfe/trunk/test/SemaCXX/warn-empty-body.cpp
Modified: cfe/trunk/include/clang/Sema/Sema.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=318665&r1=318664&r2=318665&view=diff
==============================================================================
--- cfe/trunk/include/clang/Sema/Sema.h (original)
+++ cfe/trunk/include/clang/Sema/Sema.h Mon Nov 20 09:38:16 2017
@@ -9698,7 +9698,6 @@ public:
class ConditionResult {
Decl *ConditionVar;
FullExprArg Condition;
- SourceLocation RParenLoc;
bool Invalid;
bool HasKnownValue;
bool KnownValue;
@@ -9722,9 +9721,6 @@ public:
return std::make_pair(cast_or_null<VarDecl>(ConditionVar),
Condition.get());
}
-
- void setRParenLoc(SourceLocation Loc) { RParenLoc = Loc; }
-
llvm::Optional<bool> getKnownValue() const {
if (!HasKnownValue)
return None;
Modified: cfe/trunk/lib/Parse/ParseStmt.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseStmt.cpp?rev=318665&r1=318664&r2=318665&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseStmt.cpp (original)
+++ cfe/trunk/lib/Parse/ParseStmt.cpp Mon Nov 20 09:38:16 2017
@@ -1101,7 +1101,6 @@ bool Parser::ParseParenExprOrCondition(S
// Otherwise the condition is valid or the rparen is present.
T.consumeClose();
- Cond.setRParenLoc(T.getCloseLocation());
// Check for extraneous ')'s to catch things like "if (foo())) {". We know
// that all callers are looking for a statement after the condition, so ")"
Modified: cfe/trunk/lib/Sema/SemaChecking.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=318665&r1=318664&r2=318665&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaChecking.cpp (original)
+++ cfe/trunk/lib/Sema/SemaChecking.cpp Mon Nov 20 09:38:16 2017
@@ -11821,7 +11821,7 @@ static bool ShouldDiagnoseEmptyStmtBody(
// Get line numbers of statement and body.
bool StmtLineInvalid;
- unsigned StmtLine = SourceMgr.getSpellingLineNumber(StmtLoc,
+ unsigned StmtLine = SourceMgr.getPresumedLineNumber(StmtLoc,
&StmtLineInvalid);
if (StmtLineInvalid)
return false;
Modified: cfe/trunk/lib/Sema/SemaStmt.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=318665&r1=318664&r2=318665&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaStmt.cpp (original)
+++ cfe/trunk/lib/Sema/SemaStmt.cpp Mon Nov 20 09:38:16 2017
@@ -530,7 +530,8 @@ Sema::ActOnIfStmt(SourceLocation IfLoc,
if (elseStmt)
DiagnoseEmptyStmtBody(ElseLoc, elseStmt, diag::warn_empty_else_body);
else
- DiagnoseEmptyStmtBody(Cond.RParenLoc, thenStmt, diag::warn_empty_if_body);
+ DiagnoseEmptyStmtBody(CondExpr->getLocEnd(), thenStmt,
+ diag::warn_empty_if_body);
return BuildIfStmt(IfLoc, IsConstexpr, InitStmt, Cond, thenStmt, ElseLoc,
elseStmt);
Modified: cfe/trunk/test/SemaCXX/warn-empty-body.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-empty-body.cpp?rev=318665&r1=318664&r2=318665&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-empty-body.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-empty-body.cpp Mon Nov 20 09:38:16 2017
@@ -301,14 +301,3 @@ void test7(int x, int y) {
if (x) IDENTITY(); // no-warning
}
-#define SOME_IF(A) if (A)
-#define IF_ELSE(A) if (A); else
-
-
-void test_macros() {
- SOME_IF(0);
- IF_ELSE(0);
-
- IDENTITY(if (0);) // expected-warning{{if statement has empty body}}
expected-note{{separate line}}
- IDENTITY(if (0); else;) // expected-warning{{else clause has empty body}}
expected-note{{separate line}}}
-}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
