[PATCH] D40185: Loosen -Wempty-body warning.

[Reid Kleckner via Phabricator via cfe-commits]

rnk updated this revision to Diff 123406.
rnk added a comment.

- minor tweak


https://reviews.llvm.org/D40185

Files:
  clang/include/clang/Sema/Sema.h
  clang/lib/Parse/ParseStmt.cpp
  clang/lib/Sema/SemaChecking.cpp
  clang/lib/Sema/SemaStmt.cpp
  clang/test/SemaCXX/warn-empty-body.cpp


Index: clang/test/SemaCXX/warn-empty-body.cpp
===================================================================
--- clang/test/SemaCXX/warn-empty-body.cpp
+++ clang/test/SemaCXX/warn-empty-body.cpp
@@ -301,3 +301,14 @@
   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}}}
+}
Index: clang/lib/Sema/SemaStmt.cpp
===================================================================
--- clang/lib/Sema/SemaStmt.cpp
+++ clang/lib/Sema/SemaStmt.cpp
@@ -530,8 +530,7 @@
   if (elseStmt)
     DiagnoseEmptyStmtBody(ElseLoc, elseStmt, diag::warn_empty_else_body);
   else
-    DiagnoseEmptyStmtBody(CondExpr->getLocEnd(), thenStmt,
-                          diag::warn_empty_if_body);
+    DiagnoseEmptyStmtBody(Cond.RParenLoc, thenStmt, diag::warn_empty_if_body);
 
   return BuildIfStmt(IfLoc, IsConstexpr, InitStmt, Cond, thenStmt, ElseLoc,
                      elseStmt);
Index: clang/lib/Sema/SemaChecking.cpp
===================================================================
--- clang/lib/Sema/SemaChecking.cpp
+++ clang/lib/Sema/SemaChecking.cpp
@@ -11815,7 +11815,7 @@
 
   // Get line numbers of statement and body.
   bool StmtLineInvalid;
-  unsigned StmtLine = SourceMgr.getPresumedLineNumber(StmtLoc,
+  unsigned StmtLine = SourceMgr.getSpellingLineNumber(StmtLoc,
                                                       &StmtLineInvalid);
   if (StmtLineInvalid)
     return false;
Index: clang/lib/Parse/ParseStmt.cpp
===================================================================
--- clang/lib/Parse/ParseStmt.cpp
+++ clang/lib/Parse/ParseStmt.cpp
@@ -1101,6 +1101,7 @@
 
   // 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 ")"
Index: clang/include/clang/Sema/Sema.h
===================================================================
--- clang/include/clang/Sema/Sema.h
+++ clang/include/clang/Sema/Sema.h
@@ -9690,6 +9690,7 @@
   class ConditionResult {
     Decl *ConditionVar;
     FullExprArg Condition;
+    SourceLocation RParenLoc;
     bool Invalid;
     bool HasKnownValue;
     bool KnownValue;
@@ -9713,6 +9714,9 @@
       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;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40185.123406.patch
Type: text/x-patch
Size: 2883 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20171117/206126c5/attachment.bin>