[clang] Reword apologetic Clang diagnostic messages #76310

pav-code · 2023-12-24T00:57:49Z

Fixes Issue: #61256

github-actions · 2023-12-24T00:58:03Z

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be
notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write
permissions for the repository. In which case you can instead tag reviewers by
name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review
by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate
is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

llvmbot · 2023-12-24T00:58:41Z

@llvm/pr-subscribers-clang

Author: Pavel Gueorguiev (pav-code)

Changes

Fixes Issue: #61256

Full diff: https://github.com/llvm/llvm-project/pull/76310.diff

7 Files Affected:

(modified) clang/include/clang/Basic/DiagnosticCommonKinds.td (+2-2)
(modified) clang/include/clang/Basic/DiagnosticSemaKinds.td (+5-5)
(modified) clang/test/CXX/drs/dr16xx.cpp (+1-1)
(modified) clang/test/CXX/drs/dr18xx.cpp (+1-1)
(modified) clang/test/Lexer/SourceLocationsOverflow.c (+1-1)
(modified) clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp (+2-2)
(modified) clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp (+6-6)

diff --git a/clang/include/clang/Basic/DiagnosticCommonKinds.td b/clang/include/clang/Basic/DiagnosticCommonKinds.td
index 65a33f61a6948a..aceaa518d55ea9 100644
--- a/clang/include/clang/Basic/DiagnosticCommonKinds.td
+++ b/clang/include/clang/Basic/DiagnosticCommonKinds.td
@@ -355,9 +355,9 @@ def err_cannot_open_file : Error<"cannot open file '%0': %1">, DefaultFatal;
 def err_file_modified : Error<
   "file '%0' modified since it was first processed">, DefaultFatal;
 def err_file_too_large : Error<
-  "sorry, unsupported: file '%0' is too large for Clang to process">;
+  "file '%0' is too large for Clang to process">;
 def err_sloc_space_too_large : Error<
-  "sorry, the translation unit is too large for Clang to process: ran out of source locations">, DefaultFatal;
+  "translation unit is too large for Clang to process: ran out of source locations">, DefaultFatal;
 def err_unsupported_bom : Error<"%0 byte order mark detected in '%1', but "
   "encoding is not supported">, DefaultFatal;
 def err_unable_to_rename_temp : Error<
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index aebb7d9b945c33..dbe2b16b5fc39f 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -5135,7 +5135,7 @@ def err_non_type_template_arg_subobject : Error<
 def err_non_type_template_arg_addr_label_diff : Error<
   "template argument / label address difference / what did you expect?">;
 def err_non_type_template_arg_unsupported : Error<
-  "sorry, non-type template argument of type %0 is not yet supported">;
+  "non-type template argument of type %0 is not yet supported">;
 def err_template_arg_not_convertible : Error<
   "non-type template argument of type %0 cannot be converted to a value "
   "of type %1">;
@@ -5188,7 +5188,7 @@ def err_template_arg_not_object_or_func : Error<
 def err_template_arg_not_pointer_to_member_form : Error<
   "non-type template argument is not a pointer to member constant">;
 def err_template_arg_member_ptr_base_derived_not_supported : Error<
-  "sorry, non-type template argument of pointer-to-member type %1 that refers "
+  "non-type template argument of a pointer to member type %1, that refers "
   "to member %q0 of a different class is not supported yet">;
 def err_template_arg_invalid : Error<
   "non-type template argument '%0' is invalid">;
@@ -9913,11 +9913,11 @@ def warn_new_dangling_initializer_list : Warning<
   "will be destroyed at the end of the full-expression">,
   InGroup<DanglingInitializerList>;
 def warn_unsupported_lifetime_extension : Warning<
-  "sorry, lifetime extension of "
+  "lifetime extension of "
   "%select{temporary|backing array of initializer list}0 created "
-  "by aggregate initialization using default member initializer "
+  "by aggregate initialization using a default member initializer "
   "is not supported; lifetime of %select{temporary|backing array}0 "
-  "will end at the end of the full-expression">, InGroup<Dangling>;
+  "will terminate at the end of the full-expression">, InGroup<Dangling>;
 
 // For non-floating point, expressions of the form x == x or x != x
 // should result in a warning, since these always evaluate to a constant.
diff --git a/clang/test/CXX/drs/dr16xx.cpp b/clang/test/CXX/drs/dr16xx.cpp
index 3f074c4d57354a..2ffeb5372ec1d2 100644
--- a/clang/test/CXX/drs/dr16xx.cpp
+++ b/clang/test/CXX/drs/dr16xx.cpp
@@ -472,7 +472,7 @@ namespace dr1696 { // dr1696: 7
     const A &a = A(); // #dr1696-D1-a
   };
   D1 d1 = {}; // #dr1696-d1
-  // since-cxx14-warning@-1 {{sorry, lifetime extension of temporary created by aggregate initialization using default member initializer is not supported; lifetime of temporary will end at the end of the full-expression}}
+  // since-cxx14-warning@-1 {{lifetime extension of temporary created by aggregate initialization using a default member initializer is not supported; lifetime of temporary will terminate at the end of the full-expression}}
   //   since-cxx14-note@#dr1696-D1-a {{initializing field 'a' with default member initializer}}
 
   struct D2 {
diff --git a/clang/test/CXX/drs/dr18xx.cpp b/clang/test/CXX/drs/dr18xx.cpp
index fbe67bd0c2f6db..0179d411358902 100644
--- a/clang/test/CXX/drs/dr18xx.cpp
+++ b/clang/test/CXX/drs/dr18xx.cpp
@@ -56,7 +56,7 @@ namespace dr1815 { // dr1815: no
   // FIXME: needs codegen test
   struct A { int &&r = 0; }; // #dr1815-A 
   A a = {};
-  // since-cxx14-warning@-1 {{sorry, lifetime extension of temporary created by aggregate initialization using default member initializer is not supported; lifetime of temporary will end at the end of the full-expression}} FIXME
+  // since-cxx14-warning@-1 {{lifetime extension of temporary created by aggregate initialization using a default member initializer is not supported; lifetime of temporary will terminate at the end of the full-expression}} FIXME
   //   since-cxx14-note@#dr1815-A {{initializing field 'r' with default member initializer}}
 
   struct B { int &&r = 0; }; // #dr1815-B
diff --git a/clang/test/Lexer/SourceLocationsOverflow.c b/clang/test/Lexer/SourceLocationsOverflow.c
index c42f648fedf501..f058c09428e6e7 100644
--- a/clang/test/Lexer/SourceLocationsOverflow.c
+++ b/clang/test/Lexer/SourceLocationsOverflow.c
@@ -1,6 +1,6 @@
 // RUN: not %clang %s -S -o - 2>&1 | FileCheck %s
 // CHECK: In file included from {{.*}}SourceLocationsOverflow.c
-// CHECK-NEXT: inc1.h{{.*}}: fatal error: sorry, the translation unit is too large for Clang to process: ran out of source locations
+// CHECK-NEXT: inc1.h{{.*}}: fatal error: translation unit is too large for Clang to process: ran out of source locations
 // CHECK-NEXT: #include "inc2.h"
 // CHECK-NEXT:          ^
 // CHECK-NEXT: note: 214{{.......}}B in local locations, 0B in locations loaded from AST files, for a total of 214{{.......}}B (99% of available space)
diff --git a/clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp b/clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp
index 22788e1c1ffb3a..35c342492099a0 100644
--- a/clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp
+++ b/clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp
@@ -205,9 +205,9 @@ namespace Auto {
 
     struct Y : X {};
     void type_affects_identity(B<&X::n>) {}
-    void type_affects_identity(B<(int Y::*)&X::n>) {} // FIXME: expected-error {{sorry}}
+    void type_affects_identity(B<(int Y::*)&X::n>) {} // FIXME: expected-error {{non-type template argument of a pointer to member type}}
     void type_affects_identity(B<(const int X::*)&X::n>) {}
-    void type_affects_identity(B<(const int Y::*)&X::n>) {} // FIXME: expected-error {{sorry}}
+    void type_affects_identity(B<(const int Y::*)&X::n>) {} // FIXME: expected-error {{non-type template argument of a pointer to member type}}
 
     // A case where we need to do auto-deduction, and check whether the
     // resulting dependent types match during partial ordering. These
diff --git a/clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp b/clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp
index 792dc78464b2a8..27559f5e3241ca 100644
--- a/clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp
+++ b/clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp
@@ -8,8 +8,8 @@ namespace std {
 
 // floating-point arguments
 template<float> struct Float {};
-using F1 = Float<1.0f>; // FIXME expected-error {{sorry}}
-using F1 = Float<2.0f / 2>; // FIXME expected-error {{sorry}}
+using F1 = Float<1.0f>; // FIXME expected-error {{non-type template argument of type}}
+using F1 = Float<2.0f / 2>; // FIXME expected-error {{non-type template argument of type}}
 
 struct S { int n[3]; } s; // expected-note 1+{{here}}
 union U { int a, b; } u;
@@ -48,12 +48,12 @@ using U1 = Union<U{.b = 1}>; // expected-error {{different types}}
 
 // miscellaneous scalar types
 template<_Complex int> struct ComplexInt {};
-using CI = ComplexInt<1 + 3i>; // FIXME: expected-error {{sorry}}
-using CI = ComplexInt<1 + 3i>; // FIXME: expected-error {{sorry}}
+using CI = ComplexInt<1 + 3i>; // FIXME: expected-error {{non-type template argument of type}}
+using CI = ComplexInt<1 + 3i>; // FIXME: expected-error {{non-type template argument of type}}
 
 template<_Complex float> struct ComplexFloat {};
-using CF = ComplexFloat<1.0f + 3.0fi>; // FIXME: expected-error {{sorry}}
-using CF = ComplexFloat<1.0f + 3.0fi>; // FIXME: expected-error {{sorry}}
+using CF = ComplexFloat<1.0f + 3.0fi>; // FIXME: expected-error {{non-type template argument of type}}
+using CF = ComplexFloat<1.0f + 3.0fi>; // FIXME: expected-error {{non-type template argument of type}}
 
 namespace ClassNTTP {
   struct A { // expected-note 2{{candidate}}

pav-code · 2023-12-24T01:43:25Z

As the bot suggested - I am tagging the issue creator!

@tbaederr

cor3ntin · 2023-12-24T17:46:58Z

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -5188,7 +5188,7 @@ def err_template_arg_not_object_or_func : Error<
 def err_template_arg_not_pointer_to_member_form : Error<
  "non-type template argument is not a pointer to member constant">;
 def err_template_arg_member_ptr_base_derived_not_supported : Error<
-  "sorry, non-type template argument of pointer-to-member type %1 that refers "
+  "non-type template argument of a pointer to member type %1, that refers "


pointer-to-member is a term of art, we should keep it (and a is incorrect grammatically)

Changed. I found it odd that there are places where it's sometimes 'pointer-to-member' and other times 'pointer to member' (like even right in the line above 5189: ...not a pointer to member...)

cor3ntin · 2023-12-24T17:48:36Z

clang/include/clang/Basic/DiagnosticSemaKinds.td

  "is not supported; lifetime of %select{temporary|backing array}0 "
-  "will end at the end of the full-expression">, InGroup<Dangling>;
+  "will terminate at the end of the full-expression">, InGroup<Dangling>;


end is the more correct terminology here, it is a term of art - and we should avoid overloading "terminate"

thesamesam · 2023-12-25T10:50:54Z

clang/include/clang/Basic/DiagnosticSemaKinds.td

  "%select{temporary|backing array of initializer list}0 created "
-  "by aggregate initialization using default member initializer "
+  "by aggregate initialization using a default member initializer "
  "is not supported; lifetime of %select{temporary|backing array}0 "


Perhaps "is not yet supported" or similar. As noted at #61256 (comment), the "sorry" kind of indicated that it was Clang's fault, rather than the code doing something wrong.

erichkeane · 2024-01-03T16:28:36Z

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -5188,7 +5188,7 @@ def err_template_arg_not_object_or_func : Error<
 def err_template_arg_not_pointer_to_member_form : Error<
  "non-type template argument is not a pointer to member constant">;
 def err_template_arg_member_ptr_base_derived_not_supported : Error<
-  "sorry, non-type template argument of pointer-to-member type %1 that refers "
+  "non-type template argument of pointer-to-member type %1, that refers "


Suggested change

"non-type template argument of pointer-to-member type %1, that refers "

"non-type template argument of pointer-to-member type %1 that refers "

pav-code · 2024-01-13T17:30:25Z

I fixed all the comments. So what's the next step?

AaronBallman

LGTM!

AaronBallman · 2024-01-15T16:11:21Z

I fixed all the comments. So what's the next step?

I've merged the commit on your behalf, thank you for the cleanup!

Fixes Issue: llvm#61256

[clang] Reword apologetic Clang diagnostic messages

82fe20f

Fixes Issue: llvm#61256

pav-code requested a review from Endilll as a code owner December 24, 2023 00:57

llvmbot added clang Clang issues not falling into any other category clang:frontend Language frontend issues, e.g. anything involving "Sema" labels Dec 24, 2023

shafik requested review from cor3ntin, shafik, erichkeane and tbaederr December 24, 2023 04:32

cor3ntin reviewed Dec 24, 2023

View reviewed changes

thesamesam reviewed Dec 25, 2023

View reviewed changes

pav-code requested review from cor3ntin and thesamesam January 2, 2024 20:45

erichkeane reviewed Jan 3, 2024

View reviewed changes

Address PR comments

e98ae49

pav-code force-pushed the users/pav-code/edit-clang-diagnostic-messages branch from a46577a to e98ae49 Compare January 6, 2024 19:21

pav-code requested a review from erichkeane January 7, 2024 06:20

AaronBallman approved these changes Jan 15, 2024

View reviewed changes

AaronBallman merged commit 24c89bb into llvm:main Jan 15, 2024

justinfargnoli pushed a commit to justinfargnoli/llvm-project that referenced this pull request Jan 28, 2024

[clang] Reword apologetic Clang diagnostic messages (llvm#76310)

40659ca

Fixes Issue: llvm#61256

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[clang] Reword apologetic Clang diagnostic messages #76310

[clang] Reword apologetic Clang diagnostic messages #76310

Uh oh!

pav-code commented Dec 24, 2023

Uh oh!

github-actions bot commented Dec 24, 2023

Uh oh!

llvmbot commented Dec 24, 2023

Uh oh!

pav-code commented Dec 24, 2023

Uh oh!

cor3ntin Dec 24, 2023

Uh oh!

pav-code Jan 2, 2024

Uh oh!

cor3ntin Dec 24, 2023

Uh oh!

thesamesam Dec 25, 2023

Uh oh!

erichkeane Jan 3, 2024

Uh oh!

pav-code commented Jan 13, 2024

Uh oh!

AaronBallman left a comment

Uh oh!

AaronBallman commented Jan 15, 2024

Uh oh!

Uh oh!

	"non-type template argument of pointer-to-member type %1, that refers "
	"non-type template argument of pointer-to-member type %1 that refers "

[clang] Reword apologetic Clang diagnostic messages #76310

[clang] Reword apologetic Clang diagnostic messages #76310

Uh oh!

Conversation

pav-code commented Dec 24, 2023

Uh oh!

github-actions bot commented Dec 24, 2023

Uh oh!

llvmbot commented Dec 24, 2023

Uh oh!

pav-code commented Dec 24, 2023

Uh oh!

cor3ntin Dec 24, 2023

Choose a reason for hiding this comment

Uh oh!

pav-code Jan 2, 2024

Choose a reason for hiding this comment

Uh oh!

cor3ntin Dec 24, 2023

Choose a reason for hiding this comment

Uh oh!

thesamesam Dec 25, 2023

Choose a reason for hiding this comment

Uh oh!

erichkeane Jan 3, 2024

Choose a reason for hiding this comment

Uh oh!

pav-code commented Jan 13, 2024

Uh oh!

AaronBallman left a comment

Choose a reason for hiding this comment

Uh oh!

AaronBallman commented Jan 15, 2024

Uh oh!

Uh oh!