3 files changed, 2 insertions, 87 deletions
diff --git a/clang/test/Analysis/logical-ops.c b/clang/test/Analysis/logical-ops.c
index 2a03d96c0cb..afaa2f10778 100644
--- a/clang/test/Analysis/logical-ops.c
+++ b/clang/test/Analysis/logical-ops.c
@@ -36,5 +36,4 @@ int between(char *x) {
 int undef(void) {} // expected-warning{{control reaches end of non-void function}}
 void useUndef(void) { 0 || undef(); }
 
-void testPointer(void) { (void) (1 && testPointer && 0); } // expected-warning {{address of function 'testPointer' will always evaluate to 'true'}} \
-							   // expected-note {{prefix with the address-of operator to silence this warning}}
+void testPointer(void) { (void) (1 && testPointer && 0); }
diff --git a/clang/test/Sema/exprs.c b/clang/test/Sema/exprs.c
index 17b1aa2851b..2fb17e4880c 100644
--- a/clang/test/Sema/exprs.c
+++ b/clang/test/Sema/exprs.c
@@ -244,10 +244,6 @@ void test22() {
   if ("help")
     (void) 0;
 
-  if (test22) // expected-warning {{address of function 'test22' will always evaluate to 'true'}} \
-	      // expected-note {{prefix with the address-of operator to silence this warning}}
-    (void) 0;
-
-  if (&test22)
+  if (test22)
     (void) 0;
 }
diff --git a/clang/test/Sema/warn-tautological-compare.c b/clang/test/Sema/warn-tautological-compare.c
index 2856eddc7b0..e69de29bb2d 100644
--- a/clang/test/Sema/warn-tautological-compare.c
+++ b/clang/test/Sema/warn-tautological-compare.c
@@ -1,80 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin -fsyntax-only -verify  %s
-// rdar://18716393
-
-extern int a[] __attribute__((weak));
-int b[] = {8,13,21};
-struct {
-  int x[10];
-} c;
-const char str[] = "text";
-
-void ignore() {
-  if (!a) {}
-}
-void test() {
-  if (!b) {} // expected-warning {{address of array 'b' will always evaluate to 'true'}}
-  if (b == 0) {} // expected-warning {{comparison of array 'b' equal to a null pointer is always false}}
-  if (!c.x) {} // expected-warning {{address of array 'c.x' will always evaluate to 'true'}}
-  if (c.x == 0) {} // expected-warning {{comparison of array 'c.x' equal to a null pointer is always false}}
-  if (!str) {} // expected-warning {{address of array 'str' will always evaluate to 'true'}}
-  if (0 == str) {} // expected-warning {{comparison of array 'str' equal to a null pointer is always false}}
-}
-
-int array[2];
-int test1()
-{
-  if (!array) { // expected-warning {{address of array 'array' will always evaluate to 'true'}}
-    return array[0];
-  } else if (array != 0) { // expected-warning {{comparison of array 'array' not equal to a null pointer is always true}}
-    return array[1];
-  }
-  if (array == 0) // expected-warning {{comparison of array 'array' equal to a null pointer is always false}}
-    return 1;
-  return 0;
-}
-
-#define NULL (void*)0
-
-int test2(int* pointer, char ch, void * pv) {
-   if (!&pointer) {  // expected-warning {{address of 'pointer' will always evaluate to 'true'}}
-     return 0;
-   }
-
-   if (&pointer) {  // expected-warning {{address of 'pointer' will always evaluate to 'true'}}
-     return 0;
-   }
-
-   if (&pointer == NULL) {} // expected-warning {{comparison of address of 'pointer' equal to a null pointer is always false}}
-
-   if (&pointer != NULL) {} // expected-warning {{comparison of address of 'pointer' not equal to a null pointer is always true}}
-
-   return 1;
-}
-
-void test3() {
-   if (array) { } // expected-warning {{address of array 'array' will always evaluate to 'true'}}
-   if (array != 0) {} // expected-warning {{comparison of array 'array' not equal to a null pointer is always true}}
-   if (!array) { } // expected-warning {{address of array 'array' will always evaluate to 'true'}}
-   if (array == 0) {} // expected-warning {{comparison of array 'array' equal to a null pointer is always false}}
-
-   if (array[0] &&
-       array) {} // expected-warning {{address of array 'array' will always evaluate to 'true'}}
-
-   if (array[0] ||
-       array) {} // expected-warning {{address of array 'array' will always evaluate to 'true'}}
-
-   if (array[0] &&
-       !array) {} // expected-warning {{address of array 'array' will always evaluate to 'true'}}
-   if (array[0] ||
-       !array) {} // expected-warning {{address of array 'array' will always evaluate to 'true'}}
-
-   if (array && // expected-warning {{address of array 'array' will always evaluate to 'true'}}
-       array[0]) {}
-   if (!array || // expected-warning {{address of array 'array' will always evaluate to 'true'}}
-       array[0]) {}
-
-   if (array ||  // expected-warning {{address of array 'array' will always evaluate to 'true'}}
-       (!array && array[0])) {} // expected-warning {{address of array 'array' will always evaluate to 'true'}}
- }
-
-