From 4d8efb48b9de9feee79c948ef9d05febd6d0c20b Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian <fjahanian@apple.com> Date: Fri, 11 Jan 2013 19:33:54 +0000 Subject: [PATCH] Improve diagnostic per Richard's suggestion (which may yet change if we move the diagnostic outside case value). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172242 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticSemaKinds.td | 2 +- test/Sema/switch-1.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 6712f20cd35..0b1917a46d2 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -5713,7 +5713,7 @@ def warn_case_value_overflow : Warning< "overflow converting case value to switch condition type (%0 to %1)">, InGroup<Switch>; def warn_case_constant_overflow : Warning< - "overflow in case constant expression results in new value (%0)">, + "overflow in case constant expression results in value %0">, InGroup<Switch>; def err_duplicate_case : Error<"duplicate case value '%0'">; def err_duplicate_case_differing_expr : Error< diff --git a/test/Sema/switch-1.c b/test/Sema/switch-1.c index 2b729ac0ad3..e029bc9ffbf 100644 --- a/test/Sema/switch-1.c +++ b/test/Sema/switch-1.c @@ -5,10 +5,10 @@ int f(int i) { switch (i) { case 2147483647 + 2: // expected-note {{value 2147483649 is outside the range of representable values of type 'int'}} \ - // expected-warning {{overflow in case constant expression results in new value (-2147483647)}} + // expected-warning {{overflow in case constant expression results in value -2147483647}} return 1; case 9223372036854775807L * 4 : // expected-note {{value 36893488147419103228 is outside the range of representable values of type 'long'}} \ - // expected-warning {{overflow in case constant expression results in new value (-4)}} + // expected-warning {{overflow in case constant expression results in value -4}} return 2; case 2147483647: return 0; -- GitLab