ipriyanshi1708 created this revision. Herald added subscribers: s.egerton, mstorsjo, simoncook, asb, fedor.sergeev, krytarowski. Herald added a reviewer: aaron.ballman. Herald added a project: All. ipriyanshi1708 updated this revision to Diff 506994. ipriyanshi1708 added a comment. ipriyanshi1708 updated this revision to Diff 506999. ipriyanshi1708 published this revision for review. ipriyanshi1708 added a reviewer: samtebbs. Herald added a project: clang.
Removed wrongly added files ipriyanshi1708 added a comment. Readded wrongly removed sorry Fixes https://github.com/llvm/llvm-project/issues/61256 Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D146530 Files: clang/include/clang/Basic/DiagnosticCommonKinds.td clang/include/clang/Basic/DiagnosticSemaKinds.td clang/test/CXX/drs/dr16xx.cpp clang/test/Lexer/SourceLocationsOverflow.c clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp
Index: clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp =================================================================== --- clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp +++ clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp @@ -8,8 +8,8 @@ // 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; @@ -48,12 +48,12 @@ // 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}} Index: clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp =================================================================== --- clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp +++ clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp @@ -205,9 +205,9 @@ 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 Index: clang/test/Lexer/SourceLocationsOverflow.c =================================================================== --- clang/test/Lexer/SourceLocationsOverflow.c +++ 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, 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) Index: clang/test/CXX/drs/dr16xx.cpp =================================================================== --- clang/test/CXX/drs/dr16xx.cpp +++ clang/test/CXX/drs/dr16xx.cpp @@ -392,7 +392,7 @@ #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 { Index: clang/include/clang/Basic/DiagnosticSemaKinds.td =================================================================== --- clang/include/clang/Basic/DiagnosticSemaKinds.td +++ clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -4986,7 +4986,7 @@ 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">; @@ -5039,7 +5039,7 @@ 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">; @@ -9663,7 +9663,7 @@ "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 " Index: clang/include/clang/Basic/DiagnosticCommonKinds.td =================================================================== --- clang/include/clang/Basic/DiagnosticCommonKinds.td +++ clang/include/clang/Basic/DiagnosticCommonKinds.td @@ -335,9 +335,9 @@ 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;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits