Don't produce "comparison is always (true|false)" warnings when the

comparison itself is a constant expression. Fixes PR7536.

llvm-svn: 126057

2 files changed, 8 insertions, 2 deletions

diff --git a/clang/test/SemaCXX/compare.cpp b/clang/test/SemaCXX/compare.cpp
index ebecc0633ed..ca8af2186f7 100644
--- a/clang/test/SemaCXX/compare.cpp
+++ b/clang/test/SemaCXX/compare.cpp
@@ -206,3 +206,9 @@ void test2(int i, void *vp) {
   if (vp < 0) { }
   if (test1 < e) { } // expected-error{{comparison between pointer and integer}}
 }
+
+// PR7536
+static const unsigned int kMax = 0;
+int pr7536() {
+  return (kMax > 0);
+}
diff --git a/clang/test/SemaCXX/type-dependent-exprs.cpp b/clang/test/SemaCXX/type-dependent-exprs.cpp
index 37d7cee8816..398c3cb0339 100644
--- a/clang/test/SemaCXX/type-dependent-exprs.cpp
+++ b/clang/test/SemaCXX/type-dependent-exprs.cpp
@@ -26,10 +26,10 @@ T f(T x) {
 // This one entered into an infinite loop.
 template <unsigned long N>
 void rdar8520617() {
-  if (N > 1) { } // expected-warning {{comparison of 0 > unsigned expression is always false}}
+  if (N > 1) { }
 }
 
 int f2() {
-  rdar8520617<0>(); // expected-note {{in instantiation}}
+  rdar8520617<0>();
 }