2 files changed, 30 insertions, 4 deletions
diff --git a/clang/test/Sema/warn-string-conversion.c b/clang/test/Sema/warn-string-conversion.c
index 708dd543e40..28dfc1b67dd 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 @@ 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/clang/test/Sema/warn-tautological-compare.c b/clang/test/Sema/warn-tautological-compare.c
index 55de6179a31..e4eec11b42d 100644
--- a/clang/test/Sema/warn-tautological-compare.c
+++ b/clang/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'}}
+}