[clang][diagnostics]Removed "sorry" from all the required files

[ipriyanshi1708]

Summary

Fixes https://github.com/llvm/llvm-project/issues/61256

[ipriyanshi1708]

Removed wrongly added files

[ipriyanshi1708]

Readded wrongly removed sorry

[aaron.ballman]

This appears to be the same efforts that have been going on in https://reviews.llvm.org/D146041. Can you coordinate with @AryanGodara so that there's only one patch for this?

[ipriyanshi1708]

In D146530#4213045, @aaron.ballman wrote:

This appears to be the same efforts that have been going on in https://reviews.llvm.org/D146041. Can you coordinate with @AryanGodara so that there's only one patch for this?

Hi! I am an Outreachy applicant, firstly how can I coordinate with @AryanGodara and secondly how will it be counted as my contribution and then can I record it in my final application? Or I will have to look for some other issues for Outreachy?

[aaron.ballman]

In D146530#4213076, @ipriyanshi1708 wrote:

In D146530#4213045, @aaron.ballman wrote:

This appears to be the same efforts that have been going on in https://reviews.llvm.org/D146041. Can you coordinate with @AryanGodara so that there's only one patch for this?

Hi! I am an Outreachy applicant, firstly how can I coordinate with @AryanGodara and secondly how will it be counted as my contribution and then can I record it in my final application? Or I will have to look for some other issues for Outreachy?

Welcome! You can comment on the other review to see if the author would like to collaborate with you on a solution. We have the ability to land commits with co-author tags (please request it explicitly when someone approves the patch so that the person landing the work knows to do this), so that should get you both the attribution in GitHub that you did the work (no idea if Outreachy has rules around co-authoring though). You might have to look for other issues for Outreachy, depending on what they require.

[ipriyanshi1708]

In D146530#4213078, @aaron.ballman wrote:

In D146530#4213076, @ipriyanshi1708 wrote:

In D146530#4213045, @aaron.ballman wrote:

This appears to be the same efforts that have been going on in https://reviews.llvm.org/D146041. Can you coordinate with @AryanGodara so that there's only one patch for this?

Hi! I am an Outreachy applicant, firstly how can I coordinate with @AryanGodara and secondly how will it be counted as my contribution and then can I record it in my final application? Or I will have to look for some other issues for Outreachy?

Welcome! You can comment on the other review to see if the author would like to collaborate with you on a solution. We have the ability to land commits with co-author tags (please request it explicitly when someone approves the patch so that the person landing the work knows to do this), so that should get you both the attribution in GitHub that you did the work (no idea if Outreachy has rules around co-authoring though). You might have to look for other issues for Outreachy, depending on what they require.

Ok thanks! I will surely ask him to collaborate.

clang/include/clang/Basic/DiagnosticCommonKinds.td

 def err_invalid_feature_combination : Error<
   "invalid feature combination: %0">;
 
 // Source manager
 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">;
+  "unsupported: file '%0' is too large for Clang to process">;
 def err_include_too_large : Error<
-  "sorry, this include generates a translation unit too large for"
+  "this include generates a translation unit too large for"
   " Clang to process.">, 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<
   "unable to rename temporary '%0' to output file '%1': '%2'">;
 def err_unable_to_make_temp : Error<
   "unable to make temporary file: %0">;
 def remark_sloc_usage : Remark<

clang/include/clang/Basic/DiagnosticSemaKinds.td

 def err_deduced_non_type_template_arg_type_mismatch : Error<
   "deduced non-type template argument does not have the same type as the "
   "corresponding template parameter%diff{ ($ vs $)|}0,1">;
 def err_non_type_template_arg_subobject : Error<
   "non-type template argument refers to subobject '%0'">;
 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">;
 def warn_template_arg_negative : Warning<
   "non-type template argument with value '%0' converted to '%1' for unsigned "
   "template parameter of type %2">, InGroup<Conversion>, DefaultIgnore;
 def warn_template_arg_too_large : Warning<
   "non-type template argument value '%0' truncated to '%1' for "
def note_template_arg_internal_object : Note<
   "non-type template argument refers to %select{function|object}0 here">;
 def note_template_arg_refers_here : Note<
   "non-type template argument refers here">;
 def err_template_arg_not_object_or_func : Error<
   "non-type template argument does not refer to an object or function">;
 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 "
   "to member %q0 of a different class is not supported yet">;
 def err_template_arg_invalid : Error<
   "non-type template argument '%0' is invalid">;
 def ext_template_arg_extra_parens : ExtWarn<
   "address non-type template argument cannot be surrounded by parentheses">;
 def warn_cxx98_compat_template_arg_extra_parens : Warning<
   "redundant parentheses surrounding address non-type template argument are "
   "incompatible with C++98">, InGroup<CXX98Compat>, DefaultIgnore;
def warn_dangling_lifetime_pointer : Warning<
   InGroup<DanglingGsl>;
 def warn_new_dangling_initializer_list : Warning<
   "array backing "
   "%select{initializer list subobject of the allocated object|"
   "the allocated initializer list}0 "
   "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 "
   "is not supported; lifetime of %select{temporary|backing array}0 "
   "will end 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.
 // Array comparisons have similar warnings

clang/test/CXX/drs/dr16xx.cpp

#if __cplusplus < 201402L
     // expected-error@-2 {{binds to a temporary}}
 #endif
     const A &a = A(); // expected-note {{default member init}}
   };
   D1 d1 = {};
 #if __cplusplus < 201402L
     // expected-note@-2 {{first required here}}
 #else
-    // expected-warning-re@-4 {{sorry, lifetime extension {{.*}} not supported}}
+    // expected-warning-re@-4 {{lifetime extension {{.*}} not supported}}
 #endif
 
   struct D2 {
     const A &a = A(); // expected-note {{default member init}}
     D2() {} // expected-error {{binds to a temporary}}
   };
 
   struct D3 { // expected-error {{binds to a temporary}}

clang/test/Lexer/SourceLocationsOverflow.c

 // RUN: not %clang %s -S -o - 2>&1 | FileCheck %s
 // CHECK: In file included from {{.*}}SourceLocationsOverflow.c
-// CHECK-NEXT: inc1.h{{.*}}: fatal error: sorry, this include generates a translation unit too large for Clang to process.
+// CHECK-NEXT: inc1.h{{.*}}: fatal error: this include generates a translation unit too large for Clang to process.
 // 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)
 // CHECK-NEXT: {{.*}}inc2.h:1:1: note: file entered 214{{..}} times using 214{{.......}}B of space
 // CHECK-NEXT: /*.................................................................................................
 // CHECK-NEXT: ^
 // CHECK-NEXT: {{.*}}inc1.h:1:1: note: file entered 15 times using 39{{....}}B of space
 // CHECK-NEXT: #include "inc2.h"

clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp

namespace Basic {
 
     struct X { int n; int *p; int **pp; typedef int a, b; };
     auto t = f(B<&X::n>()); // expected-error {{no match}}
     char &u = f(B<&X::p>());
     short &v = f(B<&X::pp>());
 
     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 {{}}
     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 {{}}
 
     // A case where we need to do auto-deduction, and check whether the
     // resulting dependent types match during partial ordering. These
     // templates are not ordered due to the mismatching function parameter.
     template<typename T, auto *(*f)(T, typename T::a)> struct B<f> {}; // expected-note {{matches}}
     template<typename T, auto **(*f)(T, typename T::b)> struct B<f> {}; // expected-note {{matches}}
     int **g(X, int);
     B<&g> bg; // expected-error {{ambiguous}}

clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp

 // RUN: %clang_cc1 -fsyntax-only -verify -std=c++20 %s
 
 using size_t = __SIZE_TYPE__;
 
 namespace std {
   struct type_info;
 }
 
 // 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 {{}}
+using F1 = Float<2.0f / 2>; // FIXME expected-error {{}}
 
 struct S { int n[3]; } s; // expected-note 1+{{here}}
 union U { int a, b; } u;
 int n; // expected-note 1+{{here}}
 
 // pointers to subobjects
 template<int *> struct IntPtr {};
 using IPn = IntPtr<&n + 1>; // FIXME expected-error {{refers to subobject}}

 using S123 = Struct<S{1, 2, 4}>; // expected-error {{different types}}
 template<U> struct Union {};
 using U1 = Union<U{1}>;
 using U1 = Union<U{.a = 1}>; // expected-note {{previous}}
 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 {{}}
+using CI = ComplexInt<1 + 3i>; // FIXME: expected-error {{}}
 
 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 {{}}
+using CF = ComplexFloat<1.0f + 3.0fi>; // FIXME: expected-error {{}}
 
 namespace ClassNTTP {
   struct A { // expected-note 2{{candidate}}
     int x, y;
   };
   template<A a> constexpr int f() { return a.y; }
   static_assert(f<A{1,2}>() == 2);