Tweak wording and add diagnostic groups to misc diagnostics.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167274 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Misc/warning-flags.c b/test/Misc/warning-flags.c
index c29f495..721bc3d 100644
--- a/test/Misc/warning-flags.c
+++ b/test/Misc/warning-flags.c
@@ -173,4 +173,4 @@
The list of warnings in -Wpedantic should NEVER grow.
-CHECK: Number in -Wpedantic (not covered by other -W flags): 37
+CHECK: Number in -Wpedantic (not covered by other -W flags): 29
diff --git a/test/Sema/builtins.c b/test/Sema/builtins.c
index 357b7b6..e3b3b7e 100644
--- a/test/Sema/builtins.c
+++ b/test/Sema/builtins.c
@@ -40,7 +40,7 @@
old = __sync_fetch_and_add(); // expected-error {{too few arguments to function call}}
old = __sync_fetch_and_add(&old); // expected-error {{too few arguments to function call}}
- old = __sync_fetch_and_add((unsigned*)0, 42i); // expected-warning {{imaginary constants are an extension}}
+ old = __sync_fetch_and_add((unsigned*)0, 42i); // expected-warning {{imaginary constants are a GNU extension}}
// PR7600: Pointers are implicitly casted to integers and back.
void *old_ptr = __sync_val_compare_and_swap((void**)0, 0, 0);
diff --git a/test/Sema/cast-to-union.c b/test/Sema/cast-to-union.c
index c32964d..7b995e3 100644
--- a/test/Sema/cast-to-union.c
+++ b/test/Sema/cast-to-union.c
@@ -4,16 +4,16 @@
void f(union u);
void test(int x) {
- f((union u)x); // expected-warning {{C99 forbids casts to union type}}
+ f((union u)x); // expected-warning {{cast to union type is a GNU extension}}
f((union u)&x); // expected-error {{cast to union type from type 'int *' not present in union}}
f((union u)2U); // expected-error {{cast to union type from type 'unsigned int' not present in union}}
}
-union u w = (union u)2; // expected-warning {{C99 forbids casts to union type}}
+union u w = (union u)2; // expected-warning {{cast to union type is a GNU extension}}
union u ww = (union u)1.0; // expected-error{{cast to union type from type 'double' not present in union}}
union u x = 7; // expected-error{{initializing 'union u' with an expression of incompatible type 'int'}}
int i;
-union u zz = (union u)i; // expected-error{{initializer element is not a compile-time constant}} expected-warning {{C99 forbids casts to union type}}
+union u zz = (union u)i; // expected-error{{initializer element is not a compile-time constant}} expected-warning {{cast to union type is a GNU extension}}
struct s {int a, b;};
struct s y = { 1, 5 };
diff --git a/test/Sema/exprs.c b/test/Sema/exprs.c
index a93e12e..df3e258 100644
--- a/test/Sema/exprs.c
+++ b/test/Sema/exprs.c
@@ -40,7 +40,7 @@
}
_Complex double test2() {
- return 1.0if; // expected-warning {{imaginary constants are an extension}}
+ return 1.0if; // expected-warning {{imaginary constants are a GNU extension}}
}
// rdar://6097308