diff options
Diffstat (limited to 'clang/test/Sema')
3 files changed, 58 insertions, 510 deletions
diff --git a/clang/test/Sema/tautological-unsigned-enum-zero-compare.c b/clang/test/Sema/tautological-unsigned-enum-zero-compare.c index 43b768433db..a32cfcd8329 100644 --- a/clang/test/Sema/tautological-unsigned-enum-zero-compare.c +++ b/clang/test/Sema/tautological-unsigned-enum-zero-compare.c @@ -1,6 +1,10 @@ -// RUN: %clang_cc1 -triple=x86_64-pc-linux-gnu -fsyntax-only -DUNSIGNED -verify %s -// RUN: %clang_cc1 -triple=x86_64-pc-win32 -fsyntax-only -DSIGNED -verify %s -// RUN: %clang_cc1 -triple=x86_64-pc-win32 -fsyntax-only -Wno-tautological-unsigned-enum-zero-compare -verify %s +// RUN: %clang_cc1 -triple=x86_64-pc-linux-gnu -fsyntax-only \ +// RUN: -verify=unsigned,unsigned-signed %s +// RUN: %clang_cc1 -triple=x86_64-pc-win32 -fsyntax-only \ +// RUN: -verify=unsigned-signed %s +// RUN: %clang_cc1 -triple=x86_64-pc-win32 -fsyntax-only \ +// RUN: -Wno-tautological-unsigned-enum-zero-compare \ +// RUN: -verify=silence %s // Okay, this is where it gets complicated. // Then default enum sigdness is target-specific. @@ -12,175 +16,38 @@ int main() { enum B { B_a = -1 }; enum B b; -#ifdef UNSIGNED - if (a < 0) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} - return 0; - if (0 >= a) - return 0; - if (a > 0) - return 0; - if (0 <= a) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} - return 0; - if (a <= 0) - return 0; - if (0 > a) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} - return 0; - if (a >= 0) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} - return 0; - if (0 < a) - return 0; - - if (a < 0U) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} - return 0; - if (0U >= a) - return 0; - if (a > 0U) - return 0; - if (0U <= a) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} - return 0; - if (a <= 0U) - return 0; - if (0U > a) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} - return 0; - if (a >= 0U) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} - return 0; - if (0U < a) - return 0; - - if (b < 0) - return 0; - if (0 >= b) - return 0; - if (b > 0) - return 0; - if (0 <= b) - return 0; - if (b <= 0) - return 0; - if (0 > b) - return 0; - if (b >= 0) - return 0; - if (0 < b) - return 0; - - if (b < 0U) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} - return 0; - if (0U >= b) - return 0; - if (b > 0U) - return 0; - if (0U <= b) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} - return 0; - if (b <= 0U) - return 0; - if (0U > b) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} - return 0; - if (b >= 0U) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} - return 0; - if (0U < b) - return 0; -#elif defined(SIGNED) - if (a < 0) - return 0; - if (0 >= a) - return 0; - if (a > 0) - return 0; - if (0 <= a) - return 0; - if (a <= 0) - return 0; - if (0 > a) - return 0; - if (a >= 0) - return 0; - if (0 < a) - return 0; - - if (a < 0U) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} - return 0; - if (0U >= a) - return 0; - if (a > 0U) - return 0; - if (0U <= a) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} - return 0; - if (a <= 0U) - return 0; - if (0U > a) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} - return 0; - if (a >= 0U) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} - return 0; - if (0U < a) - return 0; - - if (b < 0) - return 0; - if (0 >= b) - return 0; - if (b > 0) - return 0; - if (0 <= b) - return 0; - if (b <= 0) - return 0; - if (0 > b) - return 0; - if (b >= 0) - return 0; - if (0 < b) - return 0; - - if (b < 0U) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} - return 0; - if (0U >= b) - return 0; - if (b > 0U) - return 0; - if (0U <= b) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} - return 0; - if (b <= 0U) - return 0; - if (0U > b) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} - return 0; - if (b >= 0U) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} - return 0; - if (0U < b) - return 0; -#else - // expected-no-diagnostics + // silence-no-diagnostics - if (a < 0) + if (a < 0) // unsigned-warning {{comparison of unsigned enum expression < 0 is always false}} return 0; if (0 >= a) return 0; if (a > 0) return 0; - if (0 <= a) + if (0 <= a) // unsigned-warning {{comparison of 0 <= unsigned enum expression is always true}} return 0; if (a <= 0) return 0; - if (0 > a) + if (0 > a) // unsigned-warning {{comparison of 0 > unsigned enum expression is always false}} return 0; - if (a >= 0) + if (a >= 0) // unsigned-warning {{comparison of unsigned enum expression >= 0 is always true}} return 0; if (0 < a) return 0; - if (a < 0U) + if (a < 0U) // unsigned-signed-warning {{comparison of unsigned enum expression < 0 is always false}} return 0; if (0U >= a) return 0; if (a > 0U) return 0; - if (0U <= a) + if (0U <= a) // unsigned-signed-warning {{comparison of 0 <= unsigned enum expression is always true}} return 0; if (a <= 0U) return 0; - if (0U > a) + if (0U > a) // unsigned-signed-warning {{comparison of 0 > unsigned enum expression is always false}} return 0; - if (a >= 0U) + if (a >= 0U) // unsigned-signed-warning {{comparison of unsigned enum expression >= 0 is always true}} return 0; if (0U < a) return 0; @@ -202,23 +69,22 @@ int main() { if (0 < b) return 0; - if (b < 0U) + if (b < 0U) // unsigned-signed-warning {{comparison of unsigned enum expression < 0 is always false}} return 0; if (0U >= b) return 0; if (b > 0U) return 0; - if (0U <= b) + if (0U <= b) // unsigned-signed-warning {{comparison of 0 <= unsigned enum expression is always true}} return 0; if (b <= 0U) return 0; - if (0U > b) + if (0U > b) // unsigned-signed-warning {{comparison of 0 > unsigned enum expression is always false}} return 0; - if (b >= 0U) + if (b >= 0U) // unsigned-signed-warning {{comparison of unsigned enum expression >= 0 is always true}} return 0; if (0U < b) return 0; -#endif if (a == 0) return 0; diff --git a/clang/test/Sema/tautological-unsigned-enum-zero-compare.cpp b/clang/test/Sema/tautological-unsigned-enum-zero-compare.cpp index 5577b68b5eb..a733b6edfc0 100644 --- a/clang/test/Sema/tautological-unsigned-enum-zero-compare.cpp +++ b/clang/test/Sema/tautological-unsigned-enum-zero-compare.cpp @@ -1,6 +1,12 @@ -// RUN: %clang_cc1 -std=c++11 -triple=x86_64-pc-linux-gnu -fsyntax-only -DUNSIGNED -verify %s -// RUN: %clang_cc1 -std=c++11 -triple=x86_64-pc-win32 -fsyntax-only -DSIGNED -verify %s -// RUN: %clang_cc1 -std=c++11 -triple=x86_64-pc-win32 -fsyntax-only -DSILENCE -Wno-tautological-unsigned-enum-zero-compare -verify %s +// RUN: %clang_cc1 -std=c++11 -triple=x86_64-pc-linux-gnu -fsyntax-only \ +// RUN: -verify=unsigned,unsigned-signed %s +// RUN: %clang_cc1 -std=c++11 -triple=x86_64-pc-win32 -fsyntax-only \ +// RUN: -verify=unsigned-signed %s +// RUN: %clang_cc1 -std=c++11 -triple=x86_64-pc-win32 -fsyntax-only \ +// RUN: -Wno-tautological-unsigned-enum-zero-compare \ +// RUN: -verify=silence %s + +// silence-no-diagnostics int main() { // On Windows, all enumerations have a fixed underlying type, which is 'int' @@ -16,71 +22,72 @@ int main() { enum C : signed { C_foo = 0, C_bar, }; enum C c; -#ifdef UNSIGNED - if (a < 0) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} + if (a < 0) // unsigned-warning {{comparison of unsigned enum expression < 0 is always false}} return 0; if (0 >= a) return 0; if (a > 0) return 0; - if (0 <= a) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} + if (0 <= a) // unsigned-warning {{comparison of 0 <= unsigned enum expression is always true}} return 0; if (a <= 0) return 0; - if (0 > a) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} + if (0 > a) // unsigned-warning {{comparison of 0 > unsigned enum expression is always false}} return 0; - if (a >= 0) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} + if (a >= 0) // unsigned-warning {{comparison of unsigned enum expression >= 0 is always true}} return 0; if (0 < a) return 0; - if (a < 0U) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} + // FIXME: As below, the issue here is that the enumeration is promoted to + // unsigned. + if (a < 0U) // unsigned-signed-warning {{comparison of unsigned enum expression < 0 is always false}} return 0; if (0U >= a) return 0; if (a > 0U) return 0; - if (0U <= a) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} + if (0U <= a) // unsigned-signed-warning {{comparison of 0 <= unsigned enum expression is always true}} return 0; if (a <= 0U) return 0; - if (0U > a) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} + if (0U > a) // unsigned-signed-warning {{comparison of 0 > unsigned enum expression is always false}} return 0; - if (a >= 0U) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} + if (a >= 0U) // unsigned-signed-warning {{comparison of unsigned enum expression >= 0 is always true}} return 0; if (0U < a) return 0; - if (b < 0) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} + if (b < 0) // unsigned-signed-warning {{comparison of unsigned enum expression < 0 is always false}} return 0; if (0 >= b) return 0; if (b > 0) return 0; - if (0 <= b) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} + if (0 <= b) // unsigned-signed-warning {{comparison of 0 <= unsigned enum expression is always true}} return 0; if (b <= 0) return 0; - if (0 > b) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} + if (0 > b) // unsigned-signed-warning {{comparison of 0 > unsigned enum expression is always false}} return 0; - if (b >= 0) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} + if (b >= 0) // unsigned-signed-warning {{comparison of unsigned enum expression >= 0 is always true}} return 0; if (0 < b) return 0; - if (b < 0U) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} + if (b < 0U) // unsigned-signed-warning {{comparison of unsigned enum expression < 0 is always false}} return 0; if (0U >= b) return 0; if (b > 0U) return 0; - if (0U <= b) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} + if (0U <= b) // unsigned-signed-warning {{comparison of 0 <= unsigned enum expression is always true}} return 0; if (b <= 0U) return 0; - if (0U > b) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} + if (0U > b) // unsigned-signed-warning {{comparison of 0 > unsigned enum expression is always false}} return 0; - if (b >= 0U) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} + if (b >= 0U) // unsigned-signed-warning {{comparison of unsigned enum expression >= 0 is always true}} return 0; if (0U < b) return 0; @@ -104,230 +111,22 @@ int main() { // FIXME: These diagnostics are terrible. The issue here is that the signed // enumeration value was promoted to an unsigned type. - if (c < 0U) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} - return 0; - if (0U >= c) - return 0; - if (c > 0U) - return 0; - if (0U <= c) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} - return 0; - if (c <= 0U) - return 0; - if (0U > c) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} - return 0; - if (c >= 0U) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} - return 0; - if (0U < c) - return 0; -#elif defined(SIGNED) - if (a < 0) - return 0; - if (0 >= a) - return 0; - if (a > 0) - return 0; - if (0 <= a) - return 0; - if (a <= 0) - return 0; - if (0 > a) - return 0; - if (a >= 0) - return 0; - if (0 < a) - return 0; - - // FIXME: As above, the issue here is that the enumeration is promoted to - // unsigned. - if (a < 0U) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} - return 0; - if (0U >= a) - return 0; - if (a > 0U) - return 0; - if (0U <= a) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} - return 0; - if (a <= 0U) - return 0; - if (0U > a) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} - return 0; - if (a >= 0U) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} - return 0; - if (0U < a) - return 0; - - if (b < 0) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} - return 0; - if (0 >= b) - return 0; - if (b > 0) - return 0; - if (0 <= b) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} - return 0; - if (b <= 0) - return 0; - if (0 > b) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} - return 0; - if (b >= 0) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} - return 0; - if (0 < b) - return 0; - - if (b < 0U) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} - return 0; - if (0U >= b) - return 0; - if (b > 0U) - return 0; - if (0U <= b) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} - return 0; - if (b <= 0U) - return 0; - if (0U > b) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} - return 0; - if (b >= 0U) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} - return 0; - if (0U < b) - return 0; - - if (c < 0) - return 0; - if (0 >= c) - return 0; - if (c > 0) - return 0; - if (0 <= c) - return 0; - if (c <= 0) - return 0; - if (0 > c) - return 0; - if (c >= 0) - return 0; - if (0 < c) - return 0; - - if (c < 0U) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} + if (c < 0U) // unsigned-signed-warning {{comparison of unsigned enum expression < 0 is always false}} return 0; if (0U >= c) return 0; if (c > 0U) return 0; - if (0U <= c) // expected-warning {{comparison of 0 <= unsigned enum expression is always true}} + if (0U <= c) // unsigned-signed-warning {{comparison of 0 <= unsigned enum expression is always true}} return 0; if (c <= 0U) return 0; - if (0U > c) // expected-warning {{comparison of 0 > unsigned enum expression is always false}} + if (0U > c) // unsigned-signed-warning {{comparison of 0 > unsigned enum expression is always false}} return 0; - if (c >= 0U) // expected-warning {{comparison of unsigned enum expression >= 0 is always true}} + if (c >= 0U) // unsigned-signed-warning {{comparison of unsigned enum expression >= 0 is always true}} return 0; if (0U < c) return 0; -#else - // expected-no-diagnostics - if (a < 0) - return 0; - if (0 >= a) - return 0; - if (a > 0) - return 0; - if (0 <= a) - return 0; - if (a <= 0) - return 0; - if (0 > a) - return 0; - if (a >= 0) - return 0; - if (0 < a) - return 0; - - if (a < 0U) - return 0; - if (0U >= a) - return 0; - if (a > 0U) - return 0; - if (0U <= a) - return 0; - if (a <= 0U) - return 0; - if (0U > a) - return 0; - if (a >= 0U) - return 0; - if (0U < a) - return 0; - - if (b < 0) - return 0; - if (0 >= b) - return 0; - if (b > 0) - return 0; - if (0 <= b) - return 0; - if (b <= 0) - return 0; - if (0 > b) - return 0; - if (b >= 0) - return 0; - if (0 < b) - return 0; - - if (b < 0U) - return 0; - if (0U >= b) - return 0; - if (b > 0U) - return 0; - if (0U <= b) - return 0; - if (b <= 0U) - return 0; - if (0U > b) - return 0; - if (b >= 0U) - return 0; - if (0U < b) - return 0; - - if (c < 0) - return 0; - if (0 >= c) - return 0; - if (c > 0) - return 0; - if (0 <= c) - return 0; - if (c <= 0) - return 0; - if (0 > c) - return 0; - if (c >= 0) - return 0; - if (0 < c) - return 0; - - if (c < 0U) - return 0; - if (0U >= c) - return 0; - if (c > 0U) - return 0; - if (0U <= c) - return 0; - if (c <= 0U) - return 0; - if (0U > c) - return 0; - if (c >= 0U) - return 0; - if (0U < c) - return 0; -#endif return 1; } @@ -340,11 +139,7 @@ int test() { enum A a; // used to crash in llvm::APSInt::getMaxValue() -#ifndef SILENCE - if (a < 0) // expected-warning {{comparison of unsigned enum expression < 0 is always false}} -#else - if (a > 0) -#endif + if (a < 0) // unsigned-signed-warning {{comparison of unsigned enum expression < 0 is always false}} return 0; return 1; diff --git a/clang/test/Sema/tautological-unsigned-zero-compare.c b/clang/test/Sema/tautological-unsigned-zero-compare.c index e0611cb4002..b9ea02a731a 100644 --- a/clang/test/Sema/tautological-unsigned-zero-compare.c +++ b/clang/test/Sema/tautological-unsigned-zero-compare.c @@ -1,7 +1,7 @@ -// RUN: %clang_cc1 -fsyntax-only -DTEST -verify %s -// RUN: %clang_cc1 -fsyntax-only -Wno-tautological-unsigned-zero-compare -verify %s -// RUN: %clang_cc1 -fsyntax-only -DTEST -verify -x c++ %s -// RUN: %clang_cc1 -fsyntax-only -Wno-tautological-unsigned-zero-compare -verify -x c++ %s +// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -fsyntax-only -Wno-tautological-unsigned-zero-compare -verify=silence %s +// RUN: %clang_cc1 -fsyntax-only -verify -x c++ %s +// RUN: %clang_cc1 -fsyntax-only -Wno-tautological-unsigned-zero-compare -verify=silence -x c++ %s unsigned uvalue(void); signed int svalue(void); @@ -13,13 +13,8 @@ template<typename T> void TFunc() { // Make sure that we do warn for normal variables in template functions ! unsigned char c = svalue(); -#ifdef TEST if (c < 0) // expected-warning {{comparison of unsigned expression < 0 is always false}} return; -#else - if (c < 0) - return; -#endif if (c < macro(0)) return; @@ -39,7 +34,8 @@ int main() unsigned un = uvalue(); -#ifdef TEST + // silence-no-diagnostics + if (un == 0) return 0; if (un != 0) @@ -91,65 +87,10 @@ int main() return 0; if (0UL >= un) return 0; -#else -// expected-no-diagnostics - if (un == 0) - return 0; - if (un != 0) - return 0; - if (un < 0) - return 0; - if (un <= 0) - return 0; - if (un > 0) - return 0; - if (un >= 0) - return 0; - - if (0 == un) - return 0; - if (0 != un) - return 0; - if (0 < un) - return 0; - if (0 <= un) - return 0; - if (0 > un) - return 0; - if (0 >= un) - return 0; - - if (un == 0UL) - return 0; - if (un != 0UL) - return 0; - if (un < 0UL) - return 0; - if (un <= 0UL) - return 0; - if (un > 0UL) - return 0; - if (un >= 0UL) - return 0; - - if (0UL == un) - return 0; - if (0UL != un) - return 0; - if (0UL < un) - return 0; - if (0UL <= un) - return 0; - if (0UL > un) - return 0; - if (0UL >= un) - return 0; -#endif signed int a = svalue(); -#ifdef TEST if (a == 0) return 0; if (a != 0) @@ -201,60 +142,6 @@ int main() return 0; if (0UL >= a) return 0; -#else -// expected-no-diagnostics - if (a == 0) - return 0; - if (a != 0) - return 0; - if (a < 0) - return 0; - if (a <= 0) - return 0; - if (a > 0) - return 0; - if (a >= 0) - return 0; - - if (0 == a) - return 0; - if (0 != a) - return 0; - if (0 < a) - return 0; - if (0 <= a) - return 0; - if (0 > a) - return 0; - if (0 >= a) - return 0; - - if (a == 0UL) - return 0; - if (a != 0UL) - return 0; - if (a < 0UL) - return 0; - if (a <= 0UL) - return 0; - if (a > 0UL) - return 0; - if (a >= 0UL) - return 0; - - if (0UL == a) - return 0; - if (0UL != a) - return 0; - if (0UL < a) - return 0; - if (0UL <= a) - return 0; - if (0UL > a) - return 0; - if (0UL >= a) - return 0; -#endif float fl = 0; |