[clang] [clang] Replace "can't" and "can not" in diagnostics with "cannot" (PR #116623)
via cfe-commits
cfe-commits at lists.llvm.org
Mon Nov 18 05:58:07 PST 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-backend-x86
Author: Krzysztof Parzyszek (kparzysz)
<details>
<summary>Changes</summary>
See https://discourse.llvm.org/t/cant-cannot-can-not-in-diagnostic-messages/83171
---
Patch is 44.98 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/116623.diff
32 Files Affected:
- (modified) clang/include/clang/Basic/DiagnosticCommonKinds.td (+3-3)
- (modified) clang/include/clang/Basic/DiagnosticDriverKinds.td (+1-1)
- (modified) clang/include/clang/Basic/DiagnosticRefactoringKinds.td (+2-2)
- (modified) clang/include/clang/Basic/DiagnosticSemaKinds.td (+8-8)
- (modified) clang/test/CodeGen/PowerPC/musttail-forward-declaration-inline.c (+1-1)
- (modified) clang/test/CodeGen/PowerPC/musttail-forward-declaration-weak.c (+1-1)
- (modified) clang/test/CodeGen/PowerPC/musttail-indirect.cpp (+1-1)
- (modified) clang/test/CodeGen/PowerPC/musttail-inline.c (+1-1)
- (modified) clang/test/CodeGen/PowerPC/musttail-undefined.c (+1-1)
- (modified) clang/test/CodeGen/PowerPC/musttail-weak.c (+1-1)
- (modified) clang/test/CodeGen/PowerPC/musttail.c (+1-1)
- (modified) clang/test/CodeGen/X86/x86_64-PR42672.c (+5-5)
- (modified) clang/test/Driver/module-output.cppm (+1-1)
- (modified) clang/test/Misc/pragma-attribute-strict-subjects.c (+3-3)
- (modified) clang/test/Modules/no-eager-load.cppm (+2-2)
- (modified) clang/test/Modules/same-decl-in-different-modules.cppm (+4-4)
- (modified) clang/test/OpenMP/for_simd_loop_messages.cpp (+1-1)
- (modified) clang/test/OpenMP/masked_taskloop_simd_linear_messages.cpp (+1-1)
- (modified) clang/test/OpenMP/master_taskloop_simd_linear_messages.cpp (+1-1)
- (modified) clang/test/OpenMP/parallel_for_simd_loop_messages.cpp (+1-1)
- (modified) clang/test/OpenMP/parallel_for_simd_messages.cpp (+1-1)
- (modified) clang/test/OpenMP/parallel_masked_taskloop_simd_linear_messages.cpp (+1-1)
- (modified) clang/test/OpenMP/parallel_master_taskloop_simd_linear_messages.cpp (+1-1)
- (modified) clang/test/OpenMP/simd_linear_messages.cpp (+1-1)
- (modified) clang/test/OpenMP/target_parallel_for_simd_ordered_messages.cpp (+11-11)
- (modified) clang/test/OpenMP/taskloop_simd_linear_messages.cpp (+1-1)
- (modified) clang/test/Parser/pragma-attribute.cpp (+6-6)
- (modified) clang/test/Refactor/Extract/ObjCProperty.m (+1-1)
- (modified) clang/test/Sema/asm.c (+2-2)
- (modified) clang/test/Sema/pragma-attribute-strict-subjects.c (+9-9)
- (modified) clang/test/SemaObjC/comptypes-legal.m (+1-1)
- (modified) clang/test/SemaOpenCL/access-qualifier.cl (+4-4)
``````````diff
diff --git a/clang/include/clang/Basic/DiagnosticCommonKinds.td b/clang/include/clang/Basic/DiagnosticCommonKinds.td
index 0c131166aff28d..f4a155bb00bb37 100644
--- a/clang/include/clang/Basic/DiagnosticCommonKinds.td
+++ b/clang/include/clang/Basic/DiagnosticCommonKinds.td
@@ -364,9 +364,9 @@ def err_target_unsupported_abi_with_fpu : Error<
def err_ppc_impossible_musttail: Error<
"'musttail' attribute for this call is impossible because %select{"
- "long calls can not be tail called on PPC|"
- "indirect calls can not be tail called on PPC|"
- "external calls can not be tail called on PPC}0"
+ "long calls cannot be tail called on PPC|"
+ "indirect calls cannot be tail called on PPC|"
+ "external calls cannot be tail called on PPC}0"
>;
def err_aix_musttail_unsupported: Error<
"'musttail' attribute is not supported on AIX">;
diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td b/clang/include/clang/Basic/DiagnosticDriverKinds.td
index 76fdbdbfb01d94..5155b23d151c04 100644
--- a/clang/include/clang/Basic/DiagnosticDriverKinds.td
+++ b/clang/include/clang/Basic/DiagnosticDriverKinds.td
@@ -553,7 +553,7 @@ def err_test_module_file_extension_format : Error<
"'blockname:major:minor:hashed:user info'">;
def err_drv_module_output_with_multiple_arch : Error<
- "option '-fmodule-output' can't be used with multiple arch options">;
+ "option '-fmodule-output' cannot be used with multiple arch options">;
def warn_drv_delayed_template_parsing_after_cxx20 : Warning<
"-fdelayed-template-parsing is deprecated after C++20">,
diff --git a/clang/include/clang/Basic/DiagnosticRefactoringKinds.td b/clang/include/clang/Basic/DiagnosticRefactoringKinds.td
index 5446b32efbdd47..e060fffc7280a7 100644
--- a/clang/include/clang/Basic/DiagnosticRefactoringKinds.td
+++ b/clang/include/clang/Basic/DiagnosticRefactoringKinds.td
@@ -14,7 +14,7 @@ let Component = "Refactoring" in {
let CategoryName = "Refactoring Invocation Issue" in {
-def err_refactor_no_selection : Error<"refactoring action can't be initiated "
+def err_refactor_no_selection : Error<"refactoring action cannot be initiated "
"without a selection">;
def err_refactor_selection_no_symbol : Error<"there is no symbol at the given "
"location">;
@@ -26,7 +26,7 @@ def err_refactor_code_outside_of_function : Error<"the selected code is not a "
def err_refactor_extract_simple_expression : Error<"the selected expression "
"is too simple to extract">;
def err_refactor_extract_prohibited_expression : Error<"the selected "
- "expression can't be extracted">;
+ "expression cannot be extracted">;
}
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 17eb28e8fc5623..3caf471d3037f9 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1151,7 +1151,7 @@ def err_pragma_attribute_matcher_subrule_contradicts_rule : Error<
def err_pragma_attribute_matcher_negated_subrule_contradicts_subrule : Error<
"negated attribute subject matcher sub-rule '%0' contradicts sub-rule '%1'">;
def err_pragma_attribute_invalid_matchers : Error<
- "attribute %0 can't be applied to %1">;
+ "attribute %0 cannot be applied to %1">;
def err_pragma_attribute_stack_mismatch : Error<
"'#pragma clang attribute %select{%1.|}0pop' with no matching"
" '#pragma clang attribute %select{%1.|}0push'">;
@@ -6150,7 +6150,7 @@ def err_mismatched_owning_module : Error<
"declaration of %0 in %select{the global module|module %2}1 follows "
"declaration in %select{the global module|module %4}3">;
def err_multiple_decl_in_different_modules : Error<
- "declaration %0 attached to named module '%1' can't be attached to "
+ "declaration %0 attached to named module '%1' cannot be attached to "
"other modules">;
def err_redefinition_different_type : Error<
"redefinition of %0 with a different type%diff{: $ vs $|}1,2">;
@@ -8560,7 +8560,7 @@ def err_typecheck_missing_return_type_incompatible : Error<
"literal|lambda expression}2 has unspecified explicit return type">;
def note_incomplete_class_and_qualified_id : Note<
- "conformance of forward class %0 to protocol %1 can not be confirmed">;
+ "conformance of forward class %0 to protocol %1 cannot be confirmed">;
def warn_incompatible_qualified_id : Warning<
"%select{%diff{assigning to $ from incompatible type $|"
"assigning to type from incompatible type}0,1"
@@ -9414,7 +9414,7 @@ let CategoryName = "Inline Assembly Issue" in {
"asm constraint has an unexpected number of alternatives: %0 vs %1">;
def err_asm_incomplete_type : Error<"asm operand has incomplete type %0">;
def err_asm_unknown_register_name : Error<"unknown register name '%0' in asm">;
- def err_asm_unwind_and_goto : Error<"unwind clobber can't be used with asm goto">;
+ def err_asm_unwind_and_goto : Error<"unwind clobber cannot be used with asm goto">;
def err_asm_invalid_global_var_reg : Error<"register '%0' unsuitable for "
"global register variables on this target">;
def err_asm_register_size_mismatch : Error<"size of register '%0' does not "
@@ -9433,7 +9433,7 @@ let CategoryName = "Inline Assembly Issue" in {
def err_asm_input_duplicate_match : Error<
"more than one input constraint matches the same output '%0'">;
def err_store_value_to_reg : Error<
- "impossible constraint in asm: can't store value into a register">;
+ "impossible constraint in asm: cannot store value into a register">;
def warn_asm_label_on_auto_decl : Warning<
"ignored asm label '%0' on automatic variable">;
@@ -10960,7 +10960,7 @@ def err_opencl_builtin_pipe_invalid_access_modifier : Error<
def err_opencl_invalid_access_qualifier : Error<
"access qualifier can only be used for pipe and image type">;
def err_opencl_invalid_read_write : Error<
- "access qualifier %0 can not be used for %1 %select{|prior to OpenCL C version 2.0 or in version 3.0 "
+ "access qualifier %0 cannot be used for %1 %select{|prior to OpenCL C version 2.0 or in version 3.0 "
"and without __opencl_c_read_write_images feature}2">;
def err_opencl_multiple_access_qualifiers : Error<
"multiple access qualifiers">;
@@ -11460,7 +11460,7 @@ def err_omp_wrong_linear_modifier : Error<
def err_omp_wrong_linear_modifier_non_reference : Error<
"variable of non-reference type %0 can be used only with 'val' modifier, but used with '%1'">;
def err_omp_step_simple_modifier_exclusive : Error<
- "step simple modifier is exclusive and can't be use with 'val', 'uval' or 'ref' modifier">;
+ "step simple modifier is exclusive and cannot be use with 'val', 'uval' or 'ref' modifier">;
def err_omp_wrong_simdlen_safelen_values : Error<
"the value of 'simdlen' parameter must be less than or equal to the value of the 'safelen' parameter">;
def err_omp_wrong_if_directive_name_modifier : Error<
@@ -11534,7 +11534,7 @@ def err_omp_schedule_nonmonotonic_static : Error<
def err_omp_simple_clause_incompatible_with_ordered : Error<
"'%0' clause with '%1' modifier cannot be specified if an 'ordered' clause is specified">;
def err_omp_ordered_simd : Error<
- "'ordered' clause with a parameter can not be specified in '#pragma omp %0' directive">;
+ "'ordered' clause with a parameter cannot be specified in '#pragma omp %0' directive">;
def err_omp_variable_in_given_clause_and_dsa : Error<
"%0 variable cannot be in a %1 clause in '#pragma omp %2' directive">;
def err_omp_param_or_this_in_clause : Error<
diff --git a/clang/test/CodeGen/PowerPC/musttail-forward-declaration-inline.c b/clang/test/CodeGen/PowerPC/musttail-forward-declaration-inline.c
index 3d8ff3985cb0f5..d0ec21209582ee 100644
--- a/clang/test/CodeGen/PowerPC/musttail-forward-declaration-inline.c
+++ b/clang/test/CodeGen/PowerPC/musttail-forward-declaration-inline.c
@@ -3,7 +3,7 @@
inline int func2(int i);
int external_call2(int i) {
- // expected-error at +1 {{'musttail' attribute for this call is impossible because external calls can not be tail called on PPC}}
+ // expected-error at +1 {{'musttail' attribute for this call is impossible because external calls cannot be tail called on PPC}}
[[clang::musttail]] return func2(i);
}
diff --git a/clang/test/CodeGen/PowerPC/musttail-forward-declaration-weak.c b/clang/test/CodeGen/PowerPC/musttail-forward-declaration-weak.c
index 4314bbdd30619e..57226d2109f325 100644
--- a/clang/test/CodeGen/PowerPC/musttail-forward-declaration-weak.c
+++ b/clang/test/CodeGen/PowerPC/musttail-forward-declaration-weak.c
@@ -3,7 +3,7 @@
int func2(int i);
int external_call2(int i) {
- // expected-error at +1 {{'musttail' attribute for this call is impossible because external calls can not be tail called on PPC}}
+ // expected-error at +1 {{'musttail' attribute for this call is impossible because external calls cannot be tail called on PPC}}
[[clang::musttail]] return func2(i);
}
diff --git a/clang/test/CodeGen/PowerPC/musttail-indirect.cpp b/clang/test/CodeGen/PowerPC/musttail-indirect.cpp
index 3f495002606d47..cc506d4f7bc1f1 100644
--- a/clang/test/CodeGen/PowerPC/musttail-indirect.cpp
+++ b/clang/test/CodeGen/PowerPC/musttail-indirect.cpp
@@ -3,6 +3,6 @@
void name(int *params) {
auto fn = (void (*)(int *))1;
- // expected-error at +1 {{'musttail' attribute for this call is impossible because indirect calls can not be tail called on PPC}}
+ // expected-error at +1 {{'musttail' attribute for this call is impossible because indirect calls cannot be tail called on PPC}}
[[clang::musttail]] return fn(params);
}
diff --git a/clang/test/CodeGen/PowerPC/musttail-inline.c b/clang/test/CodeGen/PowerPC/musttail-inline.c
index 05aac886971274..1ac841f088cf55 100644
--- a/clang/test/CodeGen/PowerPC/musttail-inline.c
+++ b/clang/test/CodeGen/PowerPC/musttail-inline.c
@@ -7,6 +7,6 @@ inline int foo(int x) {
int bar(int x)
{
- // expected-error at +1 {{'musttail' attribute for this call is impossible because external calls can not be tail called on PPC}}
+ // expected-error at +1 {{'musttail' attribute for this call is impossible because external calls cannot be tail called on PPC}}
[[clang::musttail]] return foo(1);
}
diff --git a/clang/test/CodeGen/PowerPC/musttail-undefined.c b/clang/test/CodeGen/PowerPC/musttail-undefined.c
index f2259adb018482..fb3845218a6225 100644
--- a/clang/test/CodeGen/PowerPC/musttail-undefined.c
+++ b/clang/test/CodeGen/PowerPC/musttail-undefined.c
@@ -5,6 +5,6 @@ int foo(int x);
int bar(int x)
{
- // expected-error at +1 {{'musttail' attribute for this call is impossible because external calls can not be tail called on PPC}}
+ // expected-error at +1 {{'musttail' attribute for this call is impossible because external calls cannot be tail called on PPC}}
[[clang::musttail]] return foo(x);
}
diff --git a/clang/test/CodeGen/PowerPC/musttail-weak.c b/clang/test/CodeGen/PowerPC/musttail-weak.c
index dccc7a4d8cdd2c..1070b91bc5f35d 100644
--- a/clang/test/CodeGen/PowerPC/musttail-weak.c
+++ b/clang/test/CodeGen/PowerPC/musttail-weak.c
@@ -7,7 +7,7 @@ __attribute__((weak)) int func2(int i) {
return 0;
}
int external_call2(int i) {
- // linux-error at +2 {{'musttail' attribute for this call is impossible because external calls can not be tail called on PPC}}
+ // linux-error at +2 {{'musttail' attribute for this call is impossible because external calls cannot be tail called on PPC}}
// aix-error at +1 {{'musttail' attribute is not supported on AIX}}
[[clang::musttail]] return func2(i);
}
diff --git a/clang/test/CodeGen/PowerPC/musttail.c b/clang/test/CodeGen/PowerPC/musttail.c
index e3129263d24601..7a74d084c67be0 100644
--- a/clang/test/CodeGen/PowerPC/musttail.c
+++ b/clang/test/CodeGen/PowerPC/musttail.c
@@ -14,7 +14,7 @@ int foo(int x) {
int bar(int x)
{
// good-no-diagnostics
- // longcall-error at +2 {{'musttail' attribute for this call is impossible because long calls can not be tail called on PPC}}
+ // longcall-error at +2 {{'musttail' attribute for this call is impossible because long calls cannot be tail called on PPC}}
// aix-error at +1 {{'musttail' attribute is not supported on AIX}}
[[clang::musttail]] return foo(1);
}
diff --git a/clang/test/CodeGen/X86/x86_64-PR42672.c b/clang/test/CodeGen/X86/x86_64-PR42672.c
index 6fe612d0aabdbf..42894c0c4cb570 100644
--- a/clang/test/CodeGen/X86/x86_64-PR42672.c
+++ b/clang/test/CodeGen/X86/x86_64-PR42672.c
@@ -58,7 +58,7 @@ void odd_struct(void) {
: "=r"(str));
#endif
}
-// CHECK-IMPOSSIBLE_ODD: impossible constraint in asm: can't store value into a register
+// CHECK-IMPOSSIBLE_ODD: impossible constraint in asm: cannot store value into a register
// Check Clang reports an error if attempting to return a big structure via a register.
void big_struct(void) {
@@ -70,7 +70,7 @@ void big_struct(void) {
: "=r"(str));
#endif
}
-// CHECK-IMPOSSIBLE_BIG: impossible constraint in asm: can't store value into a register
+// CHECK-IMPOSSIBLE_BIG: impossible constraint in asm: cannot store value into a register
// Clang is able to emit LLVM IR for an 16-byte structure.
void x_constraint_fit(void) {
@@ -103,7 +103,7 @@ void x_constraint_nofit(void) {
// http://crbug.com/999160
// Clang used to report the following message:
-// "impossible constraint in asm: can't store struct into a register"
+// "impossible constraint in asm: cannot store struct into a register"
// for the assembly directive below, although there's no struct.
void crbug_999160_regtest(void) {
#ifdef IMPOSSIBLE_9BYTES
@@ -113,7 +113,7 @@ void crbug_999160_regtest(void) {
#endif
}
-// CHECK-IMPOSSIBLE_9BYTES: impossible constraint in asm: can't store value into a register
+// CHECK-IMPOSSIBLE_9BYTES: impossible constraint in asm: cannot store value into a register
void crbug_999160_regtest_v2(void) {
#ifdef IMPOSSIBLE_9BYTES_V2
@@ -121,4 +121,4 @@ void crbug_999160_regtest_v2(void) {
asm("" : "=r"(buf) : "0"(buf));
#endif
}
-// CHECK-IMPOSSIBLE_9BYTES_V2: impossible constraint in asm: can't store value into a register
+// CHECK-IMPOSSIBLE_9BYTES_V2: impossible constraint in asm: cannot store value into a register
diff --git a/clang/test/Driver/module-output.cppm b/clang/test/Driver/module-output.cppm
index bf7bfbf3cb5740..7cf0771f3d6eff 100644
--- a/clang/test/Driver/module-output.cppm
+++ b/clang/test/Driver/module-output.cppm
@@ -42,7 +42,7 @@ export module Hello;
// CHECK: "-emit-module-interface" {{.*}}"-main-file-name" "Hello.cppm" {{.*}}"-o" "{{.*}}/output/Hello.pcm" "-x" "c++" "{{.*}}/Hello.cppm"
// CHECK: "-emit-obj" {{.*}}"-main-file-name" "Hello.cppm" {{.*}}"-o" "{{.*}}/output/Hello.o" "-x" "pcm" "{{.*}}/output/Hello.pcm"
-// MULTIPLE-ARCH: option '-fmodule-output' can't be used with multiple arch options
+// MULTIPLE-ARCH: option '-fmodule-output' cannot be used with multiple arch options
// CHECK-SPECIFIED: "-emit-module-interface" {{.*}}"-main-file-name" "Hello.cppm" {{.*}}"-o" "{{.*}}/pcm/Hello.pcm" "-x" "c++" "{{.*}}/Hello.cppm"
// CHECK-SPECIFIED: "-emit-obj" {{.*}}"-main-file-name" "Hello.cppm" {{.*}}"-o" "{{.*}}/Hello.o" "-x" "pcm" "{{.*}}/pcm/Hello.pcm"
diff --git a/clang/test/Misc/pragma-attribute-strict-subjects.c b/clang/test/Misc/pragma-attribute-strict-subjects.c
index 7c2548c7dfc26b..807977fb252aa6 100644
--- a/clang/test/Misc/pragma-attribute-strict-subjects.c
+++ b/clang/test/Misc/pragma-attribute-strict-subjects.c
@@ -51,7 +51,7 @@ struct testRecoverStrictnessStruct { };
#pragma clang attribute pop
#pragma clang attribute push (__attribute__((abi_tag("a"))), apply_to = any(function, record(unless(is_union)), variable, enum))
-// expected-error at -1 {{attribute 'abi_tag' can't be applied to 'enum'}}
+// expected-error at -1 {{attribute 'abi_tag' cannot be applied to 'enum'}}
int testRecoverExtraVar = 0;
// CHECK-LABEL: VarDecl{{.*}} testRecoverExtraVar
@@ -188,7 +188,7 @@ struct testSubset7Struct { };
#pragma clang attribute push (__attribute__((abi_tag("a"))), apply_to = any(record(unless(is_union)), function, variable, enum, enum_constant))
-// expected-error at -1 {{attribute 'abi_tag' can't be applied to 'enum_constant', and 'enum'}}
+// expected-error at -1 {{attribute 'abi_tag' cannot be applied to 'enum_constant', and 'enum'}}
int testSubsetRecoverVar;
// CHECK-LABEL: VarDecl{{.*}} testSubsetRecoverVar
@@ -205,7 +205,7 @@ struct testSubsetRecoverStruct { };
#pragma clang attribute pop
#pragma clang attribute push (__attribute__((abi_tag("a"))), apply_to = enum)
-// expected-error at -1 {{attribute 'abi_tag' can't be applied to 'enum'}}
+// expected-error at -1 {{attribute 'abi_tag' cannot be applied to 'enum'}}
int testSubsetNoVar;
// CHECK-LABEL: VarDecl{{.*}} testSubsetNoVar
diff --git a/clang/test/Modules/no-eager-load.cppm b/clang/test/Modules/no-eager-load.cppm
index c9eddaaed15552..aa6de44c998f36 100644
--- a/clang/test/Modules/no-eager-load.cppm
+++ b/clang/test/Modules/no-eager-load.cppm
@@ -44,7 +44,7 @@ void use() {
// expected-note@* {{but in 'a' found a different body}}
}
-// expected-error at a.cppm:* {{declaration 'foo' attached to named module 'a' can't be attached to other modules}}
+// expected-error at a.cppm:* {{declaration 'foo' attached to named module 'a' cannot be attached to other modules}}
// expected-note at b.cppm:* {{}}
//--- h.cppm
@@ -59,5 +59,5 @@ void use() {
// expected-note@* {{but in 'a' found a different body}}
}
-// expected-error at a.cppm:* {{declaration 'foo' attached to named module 'a' can't be attached to other modules}}
+// expected-error at a.cppm:* {{declaration 'foo' attached to named module 'a' cannot be attached to other modules}}
// expected-note at b.cppm:* {{}}
diff --git a/clang/test/Modules/same-decl-in-different-modules.cppm b/clang/test/Modules/same-decl-in-different-modules.cppm
index 2e8e90f7cd8e95..8ad9e29051d4e5 100644
--- a/clang/test/Modules/same-decl-in-different-modules.cppm
+++ b/clang/test/Modules/same-decl-in-different-modules.cppm
@@ -32,11 +32,11 @@ void test() {
S<int> s;
}
-// expected-error at mod1.cppm:* {{declaration 'v' attached to named module 'mod1' can't be attached to other modules}}
+// expected-error at mod1.cppm:* {{declaration 'v' attached to named module 'mod1' cannot be attached to other modules}}
// expected-note at mod2.cppm:* {{}}
-// expected-error at mod1.cppm:* {{declaration 'func' attached to named module 'mod1' can't be attached to other modules}}
+// expected-error at mod1.cppm:* {{declaration 'func' attached to named module 'mod1' cannot be attached to other modules}}
// expected-note at mod2.cppm:* {{}}
-// expected-error at mod1.cppm:* {{declaration 'A' attached to named module 'mod1' can't be attached to other modules}}
+// expected-error at mod1.cppm:* {{declaration 'A' attached to named module 'mod1' cannot be attached to other modules}}
// expected-note at mod2.cppm:* {{}}
-// expected-error at mod1.cppm:* 1+{{declaration 'S' attached to named module 'mod1' can't be attached to other modules}}
+// expected-error at mod1.cppm:* 1+{{declaration 'S' attached to named module 'mod1' cannot be attached to other modules}}
// expected-note at mod2.cppm:* 1+{{}}
diff --git a/clang/test/OpenMP/for_simd_loop_messages.cpp b/clang/test/OpenMP/for_simd_loop_messages.cpp
index 1cc5988ea8092f..74a52f3f5d694f 100644
--- a/clang/test/OpenMP/for_simd_loop_messages.cpp
+++ b/clang/test/OpenMP/for_simd_loop_messages.cpp
@@ -731,7 +731,7 @@ void test_ordered() {
for (int i = 0; i < 16; ++i)
;
#pragma omp parallel
-// expected-error at +1 {{'ordered' clause with a parameter can not be specified in '#pragma omp for simd' directive}}
+// expected-error at +1 {{'ordered' clause with a parameter cannot be specified in '#pragma omp for simd' directive}}
#pragma omp for simd ordered(1)
for (int i = 0; i < 16; ++i)
;
diff --git a/clang/test/OpenMP/masked_taskloop_simd_linear_messages.cpp b/clang/test/OpenMP/masked_taskloop_simd_linear_messages.cpp
index 50d2da7e8fd4da..6072ad1b924452 100644
--- a/clang/test/OpenMP/masked_taskloop_simd_linear_messages.cpp
+++ b/clang/test/OpenMP/masked_taskloop_simd_linear_messages.cpp
@@ -152,7 +152,7 @@ template<class I, class C> int foomain(I argc, C **argv) {
#pragma omp masked taskloop simd linear (S1) // expected-error {{'S1' does not refer to a value}}
for (int k = 0; k < argc; ++k) ++k;
#if defined(OMP52)
- // omp52-error at +3{{step simple modifier is exclusive and can't be use with 'val', 'uval' or 'ref' modifier}}
+...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/116623
More information about the cfe-commits
mailing list