Improve diagnostic wording

llvm · Jul 17, 2024 · 0fcd6d8 · 0fcd6d8
1 parent 0f18a7a
commit 0fcd6d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -6018,7 +6018,7 @@ def note_extern_c_global_conflict : Note<
 def note_extern_c_begins_here : Note<
   "extern \"C\" language linkage specification begins here">;
 def warn_weak_import : Warning <
-  "an already-defined variable is made a weak_import declaration %0">;
+  "%0 cannot be declared 'weak_import' because its definition has been provided">;
 def ext_static_non_static : Extension<
   "redeclaring non-static %0 as static is a Microsoft extension">,
   InGroup<MicrosoftRedeclareStatic>;

diff --git a/clang/test/Sema/attr-weak.c b/clang/test/Sema/attr-weak.c
@@ -17,11 +17,11 @@ static int f(void) __attribute__((weak)); // expected-error {{weak declaration c
 static int x __attribute__((weak)); // expected-error {{weak declaration cannot have internal linkage}}
 
 int C; // expected-note {{previous definition is here}}
-extern int C __attribute__((weak_import)); // expected-warning {{an already-defined variable is made a weak_import declaration}}
+extern int C __attribute__((weak_import)); // expected-warning {{'C' cannot be declared 'weak_import'}}
 
 int C2; // expected-note {{previous definition is here}}
 extern int C2;
-extern int C2 __attribute__((weak_import)); // expected-warning {{an already-defined variable is made a weak_import declaration}}
+extern int C2 __attribute__((weak_import)); // expected-warning {{'C2' cannot be declared 'weak_import'}}
 
 static int pr14946_x;
 extern int pr14946_x  __attribute__((weak)); // expected-error {{weak declaration cannot have internal linkage}}