From d40a5a8338199e403693f811670c51d5ff51edb6 Mon Sep 17 00:00:00 2001
From: Richard Trieu <rtrieu@google.com>
Date: Wed, 20 May 2015 23:29:18 +0000
Subject: [PATCH] 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.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@237856 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Sema/SemaExpr.cpp                 |  2 ++
 test/Sema/warn-string-conversion.c    | 25 +++++++++++++++++++++----
 test/Sema/warn-tautological-compare.c |  9 +++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index a2b0fe8fc2..3fa05e417f 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -6528,6 +6528,8 @@ ExprResult Sema::ActOnConditionalOp(SourceLocation QuestionLoc,
   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,
diff --git a/test/Sema/warn-string-conversion.c b/test/Sema/warn-string-conversion.c
index 708dd543e4..28dfc1b67d 100644
--- a/test/Sema/warn-string-conversion.c
+++ b/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 @@ void test2() {
   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}}
 }
diff --git a/test/Sema/warn-tautological-compare.c b/test/Sema/warn-tautological-compare.c
index 55de6179a3..e4eec11b42 100644
--- a/test/Sema/warn-tautological-compare.c
+++ b/test/Sema/warn-tautological-compare.c
@@ -84,3 +84,12 @@ void _HTTPClientErrorHandler(int me)
   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'}}
+}
-- 
2.40.0