From 33d563e59ed97d03a7508c06bbff3967d687dede Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Mon, 26 Aug 2019 20:29:08 +0000 Subject: [PATCH] Reword the C11 extension diagnostic. This makes it more consistent with other language extension diagnostics. llvm-svn: 369957 --- .../clang/Basic/DiagnosticParseKinds.td | 2 +- clang/test/Parser/c1x-alignas.c | 4 +- clang/test/Sema/thread-specifier.c | 54 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td index 1b5f335e01d0..cc40d4bad4f5 100644 --- a/clang/include/clang/Basic/DiagnosticParseKinds.td +++ b/clang/include/clang/Basic/DiagnosticParseKinds.td @@ -127,7 +127,7 @@ def note_previous_default_assoc : Note< "previous default generic association is here">; def ext_c11_feature : Extension< - "%0 is a C11-specific feature">, InGroup; + "%0 is a C11 extension">, InGroup; def ext_c11_noreturn : Extension< "_Noreturn functions are a C11-specific feature">, InGroup; diff --git a/clang/test/Parser/c1x-alignas.c b/clang/test/Parser/c1x-alignas.c index ce8436c12fbb..3b64e6308b45 100644 --- a/clang/test/Parser/c1x-alignas.c +++ b/clang/test/Parser/c1x-alignas.c @@ -9,5 +9,5 @@ char c4 _Alignas(32); // expected-error {{expected ';' after top level declarato char _Alignas(_Alignof(int)) c5; -// CHECK-EXT: _Alignas is a C11-specific feature -// CHECK-EXT: _Alignof is a C11-specific feature +// CHECK-EXT: _Alignas is a C11 extension +// CHECK-EXT: _Alignof is a C11 extension diff --git a/clang/test/Sema/thread-specifier.c b/clang/test/Sema/thread-specifier.c index 3f1a124aef22..091bc097c7ac 100644 --- a/clang/test/Sema/thread-specifier.c +++ b/clang/test/Sema/thread-specifier.c @@ -11,16 +11,16 @@ #undef __private_extern__ #endif -__thread int t1; // thread-local-warning {{_Thread_local is a C11-specific feature}} -__thread extern int t2; // thread-local-warning {{_Thread_local is a C11-specific feature}} -__thread static int t3; // thread-local-warning {{_Thread_local is a C11-specific feature}} +__thread int t1; // thread-local-warning {{_Thread_local thread-local-warning}} +__thread extern int t2; // thread-local-warning {{_Thread_local is a C11 extension}} +__thread static int t3; // thread-local-warning {{_Thread_local is a C11 extension}} #ifdef GNU // expected-warning@-3 {{'__thread' before 'extern'}} // expected-warning@-3 {{'__thread' before 'static'}} #endif -__thread __private_extern__ int t4; // thread-local-warning {{_Thread_local is a C11-specific feature}} -struct t5 { __thread int x; }; // thread-local-warning {{_Thread_local is a C11-specific feature}} +__thread __private_extern__ int t4; // thread-local-warning {{_Thread_local is a C11 extension}} +struct t5 { __thread int x; }; // thread-local-warning {{_Thread_local is a C11 extension}} #ifdef __cplusplus // expected-error-re@-2 {{'{{__thread|_Thread_local|thread_local}}' is only allowed on variable declarations}} #else @@ -28,7 +28,7 @@ struct t5 { __thread int x; }; // thread-local-warning {{_Thread_local is a C11- // expected-error@-5 {{type name does not allow storage class to be specified}} #endif -__thread int t6(); // thread-local-warning {{_Thread_local is a C11-specific feature}} +__thread int t6(); // thread-local-warning {{_Thread_local is a C11 extension}} #if defined(GNU) // expected-error@-2 {{'__thread' is only allowed on variable declarations}} #elif defined(C11) || defined(C99) @@ -38,53 +38,53 @@ __thread int t6(); // thread-local-warning {{_Thread_local is a C11-specific fea #endif int f(__thread int t7) { // expected-error {{' is only allowed on variable declarations}} \ - // thread-local-warning {{_Thread_local is a C11-specific feature}} - __thread int t8; // thread-local-warning {{_Thread_local is a C11-specific feature}} + // thread-local-warning {{_Thread_local is a C11 extension}} + __thread int t8; // thread-local-warning {{_Thread_local is a C11 extension}} #if defined(GNU) // expected-error@-2 {{'__thread' variables must have global storage}} #elif defined(C11) || defined(C99) // expected-error@-4 {{'_Thread_local' variables must have global storage}} #endif - extern __thread int t9; // thread-local-warning {{_Thread_local is a C11-specific feature}} - static __thread int t10; // thread-local-warning {{_Thread_local is a C11-specific feature}} - __thread __private_extern__ int t11; // thread-local-warning {{_Thread_local is a C11-specific feature}} + extern __thread int t9; // thread-local-warning {{_Thread_local is a C11 extension}} + static __thread int t10; // thread-local-warning {{_Thread_local is a C11 extension}} + __thread __private_extern__ int t11; // thread-local-warning {{_Thread_local is a C11 extension}} #if __cplusplus < 201103L __thread auto int t12a; // expected-error-re {{cannot combine with previous '{{__thread|_Thread_local}}' declaration specifier}} \ - // thread-local-warning {{_Thread_local is a C11-specific feature}} + // thread-local-warning {{_Thread_local is a C11 extension}} auto __thread int t12b; // expected-error {{cannot combine with previous 'auto' declaration specifier}} \ - // thread-local-warning {{_Thread_local is a C11-specific feature}} + // thread-local-warning {{_Thread_local is a C11 extension}} #elif !defined(CXX11) __thread auto t12a = 0; // expected-error {{'_Thread_local' variables must have global storage}} \ - // thread-local-warning {{_Thread_local is a C11-specific feature}} + // thread-local-warning {{_Thread_local is a C11 extension}} auto __thread t12b = 0; // expected-error {{'_Thread_local' variables must have global storage}} \ - // thread-local-warning {{_Thread_local is a C11-specific feature}} + // thread-local-warning {{_Thread_local is a C11 extension}} #endif __thread register int t13a; // expected-error-re {{cannot combine with previous '{{__thread|_Thread_local|thread_local}}' declaration specifier}} \ - // thread-local-warning {{_Thread_local is a C11-specific feature}} + // thread-local-warning {{_Thread_local is a C11 extension}} register __thread int t13b; // expected-error {{cannot combine with previous 'register' declaration specifier}} \ - // thread-local-warning {{_Thread_local is a C11-specific feature}} + // thread-local-warning {{_Thread_local is a C11 extension}} } __thread typedef int t14; // expected-error-re {{cannot combine with previous '{{__thread|_Thread_local|thread_local}}' declaration specifier}} \ - // thread-local-warning {{_Thread_local is a C11-specific feature}} + // thread-local-warning {{_Thread_local is a C11 extension}} __thread int t15; // expected-note {{previous definition is here}} \ - // thread-local-warning {{_Thread_local is a C11-specific feature}} + // thread-local-warning {{_Thread_local is a C11 extension}} extern int t15; // expected-error {{non-thread-local declaration of 't15' follows thread-local declaration}} extern int t16; // expected-note {{previous declaration is here}} __thread int t16; // expected-error {{thread-local declaration of 't16' follows non-thread-local declaration}} \ - // thread-local-warning {{_Thread_local is a C11-specific feature}} + // thread-local-warning {{_Thread_local is a C11 extension}} #ifdef CXX11 extern thread_local int t17; // expected-note {{previous declaration is here}} _Thread_local int t17; // expected-error {{thread-local declaration of 't17' with static initialization follows declaration with dynamic initialization}} \ - // expected-warning {{_Thread_local is a C11-specific feature}} + // expected-warning {{_Thread_local is a C11 extension}} extern _Thread_local int t18; // expected-note {{previous declaration is here}} \ - // expected-warning {{_Thread_local is a C11-specific feature}} + // expected-warning {{_Thread_local is a C11 extension}} thread_local int t18; // expected-error {{thread-local declaration of 't18' with dynamic initialization follows declaration with static initialization}} #endif // PR13720 -__thread int thread_int; // thread-local-warning {{_Thread_local is a C11-specific feature}} +__thread int thread_int; // thread-local-warning {{_Thread_local is a C11 extension}} int *thread_int_ptr = &thread_int; #ifndef __cplusplus // expected-error@-2 {{initializer element is not a compile-time constant}} @@ -97,7 +97,7 @@ constexpr int *thread_int_ptr_2 = &thread_int; // expected-error {{must be initi #endif int non_const(); -__thread int non_const_init = non_const(); // thread-local-warning {{_Thread_local is a C11-specific feature}} +__thread int non_const_init = non_const(); // thread-local-warning {{_Thread_local is a C11 extension}} #if !defined(__cplusplus) // expected-error@-2 {{initializer element is not a compile-time constant}} #elif !defined(CXX11) @@ -111,7 +111,7 @@ __thread int non_const_init = non_const(); // thread-local-warning {{_Thread_loc struct S { ~S(); }; -__thread S s; // thread-local-warning {{_Thread_local is a C11-specific feature}} +__thread S s; // thread-local-warning {{_Thread_local is a C11 extension}} #if !defined(CXX11) // expected-error@-2 {{type of thread-local variable has non-trivial destruction}} #if __cplusplus >= 201103L @@ -124,7 +124,7 @@ __thread S s; // thread-local-warning {{_Thread_local is a C11-specific feature} struct HasCtor { HasCtor(); }; -__thread HasCtor var_with_ctor; // thread-local-warning {{_Thread_local is a C11-specific feature}} +__thread HasCtor var_with_ctor; // thread-local-warning {{_Thread_local is a C11 extension}} #if !defined(CXX11) // expected-error@-2 {{initializer for thread-local variable must be a constant expression}} #if __cplusplus >= 201103L @@ -133,4 +133,4 @@ __thread HasCtor var_with_ctor; // thread-local-warning {{_Thread_local is a C11 #endif #endif -__thread int aggregate[10] = {0}; // thread-local-warning {{_Thread_local is a C11-specific feature}} +__thread int aggregate[10] = {0}; // thread-local-warning {{_Thread_local is a C11 extension}}