diff --git a/clang/test/BoundsSafety/Sema/attributes_in_template_decls_attr_only_mode.cpp b/clang/test/BoundsSafety/Sema/attributes_in_template_decls_attr_only_mode.cpp index d7def9dee9b72..117ed6f20978b 100644 --- a/clang/test/BoundsSafety/Sema/attributes_in_template_decls_attr_only_mode.cpp +++ b/clang/test/BoundsSafety/Sema/attributes_in_template_decls_attr_only_mode.cpp @@ -373,9 +373,9 @@ class RefParamMustBePtrBadPartialU : public RefParamMustBePtrBadPartialBase class RefParamMustBePtrBadPartialV : public RefParamMustBePtrBadPartialBase { public: - int __single ptr2; // expected-error{{'__single' attribute only applies to pointer arguments}} + int __single ptr2; // expected-error{{'__single__' attribute only applies to pointer arguments}} typeof(RefParamMustBePtrGoodPartialBase::ptr0) ptr3; - int __single another_method() { return ptr2; } // expected-error{{'__single' attribute only applies to pointer arguments}} + int __single another_method() { return ptr2; } // expected-error{{'__single__' attribute only applies to pointer arguments}} V __single other; // no error }; diff --git a/clang/test/BoundsSafety/Sema/complex-typespecs-with-bounds.c b/clang/test/BoundsSafety/Sema/complex-typespecs-with-bounds.c index 1ac97715baee1..b3658161d863c 100644 --- a/clang/test/BoundsSafety/Sema/complex-typespecs-with-bounds.c +++ b/clang/test/BoundsSafety/Sema/complex-typespecs-with-bounds.c @@ -19,7 +19,7 @@ struct S { }; void typeofexprs(struct S s) { - // expected-error@+1{{'__single' attribute only applies to pointer arguments}} + // expected-error@+1{{'__single__' attribute only applies to pointer arguments}} typeof(foo) __single p1; // expected-error@+1{{initializing 'typeof (foo())' (aka 'char *__single') with an expression of incompatible type 'char * _Nullable' casts away '__unsafe_indexable' qualifier; use '__unsafe_forge_single' or '__unsafe_forge_bidi_indexable' to perform this conversion}} typeof(foo()) __single p2 = foo(); diff --git a/clang/test/BoundsSafety/Sema/terminated-by-attr.c b/clang/test/BoundsSafety/Sema/terminated-by-attr.c index f320e70867382..5d6c74a22c04f 100644 --- a/clang/test/BoundsSafety/Sema/terminated-by-attr.c +++ b/clang/test/BoundsSafety/Sema/terminated-by-attr.c @@ -8,7 +8,7 @@ void term(int val) { char a1[__terminated_by(0)] = ""; char a2[__terminated_by(0x40 + 1)] = {'A'}; - char a3[__terminated_by(val)] = ""; // expected-error{{'__terminated_by' attribute requires an integer constant}} + char a3[__terminated_by(val)] = ""; // expected-error{{'__terminated_by__' attribute requires an integer constant}} } void multiple_attrs(void) { diff --git a/clang/test/BoundsSafety/Sema/unsafe-late-const.c b/clang/test/BoundsSafety/Sema/unsafe-late-const.c index 5b19e6cc94382..54a3defbef570 100644 --- a/clang/test/BoundsSafety/Sema/unsafe-late-const.c +++ b/clang/test/BoundsSafety/Sema/unsafe-late-const.c @@ -12,11 +12,11 @@ unsigned global_data_const __unsafe_late_const; void *global_data_const2 __unsafe_late_const; -// expected-error@+2{{'__unsafe_late_const' attribute only applies to global variables}} -// expected-error@+2{{'__unsafe_late_const' attribute only applies to global variables}} +// expected-error@+2{{'__unsafe_late_const__' attribute only applies to global variables}} +// expected-error@+2{{'__unsafe_late_const__' attribute only applies to global variables}} void __unsafe_late_const test(int param __unsafe_late_const) { static long static_local __unsafe_late_const; - // expected-error@+1{{'__unsafe_late_const' attribute only applies to global variables}} + // expected-error@+1{{'__unsafe_late_const__' attribute only applies to global variables}} int local __unsafe_late_const; } diff --git a/clang/test/Frontend/macro_defined_type.cpp b/clang/test/Frontend/macro_defined_type.cpp index e796d9b37132c..67e7ab5eff69a 100644 --- a/clang/test/Frontend/macro_defined_type.cpp +++ b/clang/test/Frontend/macro_defined_type.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -I%S/Inputs -fsyntax-only -verify -triple x86_64-linux-gnu %s +warn-thread-safety-parsing.cpp// RUN: %clang_cc1 -I%S/Inputs -fsyntax-only -verify -triple x86_64-linux-gnu %s #include @@ -33,7 +33,7 @@ struct A { }; struct A_system_macro { - _SYS_LIBCPP_FLOAT_ABI int operator()() throw(); // expected-warning{{'_SYS_LIBCPP_FLOAT_ABI' calling convention is not supported for this target}} + _SYS_LIBCPP_FLOAT_ABI int operator()() throw(); // expected-warning{{'pcs' calling convention is not supported for this target}} }; // Added test for fix for PR43315 diff --git a/clang/test/SemaCXX/warn-thread-safety-parsing.cpp b/clang/test/SemaCXX/warn-thread-safety-parsing.cpp index 8bac502ba15ec..43036d5373c66 100644 --- a/clang/test/SemaCXX/warn-thread-safety-parsing.cpp +++ b/clang/test/SemaCXX/warn-thread-safety-parsing.cpp @@ -361,14 +361,14 @@ int gb_testfn(int y){ } void gb_function_sys_macro() _SYS_GUARDED_BY(mu1); // \ - // expected-warning {{'_SYS_GUARDED_BY' attribute only applies to}} + // expected-warning {{'pcs' attribute only applies to}} void gb_function_params_sys_macro(int gv_lvar _SYS_GUARDED_BY(mu1)); // \ - // expected-warning {{'_SYS_GUARDED_BY' attribute only applies to}} + // expected-warning {{'pcs' attribute only applies to}} int gb_testfn_sys_macro(int y){ int x _SYS_GUARDED_BY(mu1) = y; // \ - // expected-warning {{'_SYS_GUARDED_BY' attribute only applies to}} + // expected-warning {{'pcs' attribute only applies to}} return x; }