commit cbab79a4f8853bd796bf6b90de48e64a5728e8c0
author Richard Trieu <rtrieu@google.com> Wed May 20 23:29:18 2015 +0000
committer Richard Trieu <rtrieu@google.com> Wed May 20 23:29:18 2015 +0000
tree 6d7ee850b39c2a9166fc425061da10278d3d6170
parent 69fc4418ab2845a5cbbd08c913ec16c6f73890ad

Check for bool-like conversion in conditional expressions.

Add a check for bool-like conversions for the condition expression of
conditional operators.  This is similiar to the checking of condition
expressions of if statements, for-loops, while-loops, and do-while loops.
Specificially, this is to fix the problem of assert("message") not triggering
-Wstring-conversion when the assert macro uses a conditional operator.

llvm-svn: 237856

clang/lib/Sema/SemaExpr.cpp

diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index a2b0fe8..3fa05e4 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -6528,6 +6528,8 @@
   DiagnoseConditionalPrecedence(*this, QuestionLoc, Cond.get(), LHS.get(),
                                 RHS.get());
 
+  CheckBoolLikeConversion(Cond.get(), QuestionLoc);
+
   if (!commonExpr)
     return new (Context)
         ConditionalOperator(Cond.get(), QuestionLoc, LHS.get(), ColonLoc,

clang/test/Sema/warn-string-conversion.c

diff --git a/clang/test/Sema/warn-string-conversion.c b/clang/test/Sema/warn-string-conversion.c
index 708dd54..28dfc1b 100644
--- a/clang/test/Sema/warn-string-conversion.c
+++ b/clang/test/Sema/warn-string-conversion.c
@@ -1,12 +1,28 @@
 // RUN: %clang_cc1 -verify -fsyntax-only -Wstring-conversion %s
 
-#define assert(EXPR) (void)(EXPR);
+void do_nothing();
+void assert_error();
+
+#define assert1(expr) \
+  if (expr)           \
+    do_nothing();     \
+  else                \
+  assert_error()
+
+#define assert2(expr) \
+  ((expr) ? do_nothing() : assert_error())
 
 // Expection for common assert form.
 void test1() {
-  assert(0 && "foo");
-  assert("foo" && 0);
-  assert(0 || "foo"); // expected-warning {{string literal}}
+  assert1(0 && "foo");
+  assert1("foo" && 0);
+  assert1(0 || "foo"); // expected-warning {{string literal}}
+  assert1("foo"); // expected-warning {{string literal}}
+
+  assert2(0 && "foo");
+  assert2("foo" && 0);
+  assert2(0 || "foo"); // expected-warning {{string literal}}
+  assert2("foo"); // expected-warning {{string literal}}
 }
 
 void test2() {
@@ -14,4 +30,5 @@
   while ("hello") {}     // expected-warning {{string literal}}
   for (;"howdy";) {}     // expected-warning {{string literal}}
   do { } while ("hey");  // expected-warning {{string literal}}
+  int x = "hey" ? 1 : 2; // expected-warning {{string literal}}
 }

clang/test/Sema/warn-tautological-compare.c

diff --git a/clang/test/Sema/warn-tautological-compare.c b/clang/test/Sema/warn-tautological-compare.c
index 55de617..e4eec11 100644
--- a/clang/test/Sema/warn-tautological-compare.c
+++ b/clang/test/Sema/warn-tautological-compare.c
@@ -84,3 +84,12 @@
   int *result;
   SAVE_READ(&me);
 }
+
+void test_conditional_operator() {
+  int x;
+  x = b ? 1 : 0;     // expected-warning {{address of array}}
+  x = c.x ? 1 : 0;   // expected-warning {{address of array}}
+  x = str ? 1 : 0;   // expected-warning {{address of array}}
+  x = array ? 1 : 0; // expected-warning {{address of array}}
+  x = &x ? 1 : 0;    // expected-warning {{address of 'x'}}
+}