diff --git a/clang/include/clang/Basic/DiagnosticCommonKinds.td b/clang/include/clang/Basic/DiagnosticCommonKinds.td --- a/clang/include/clang/Basic/DiagnosticCommonKinds.td +++ b/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; diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/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; 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 " diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -9558,7 +9558,7 @@ AttributeCommonInfo::AS_Pragma)); WeakTopLevelDecl.push_back(NewD); // FIXME: "hideous" code from Sema::LazilyCreateBuiltin - // to insert Decl at TU scope, sorry. + // to insert Decl at TU scope. DeclContext *SavedContext = CurContext; CurContext = Context.getTranslationUnitDecl(); NewD->setDeclContext(CurContext); diff --git a/clang/lib/StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp --- a/clang/lib/StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp @@ -1212,7 +1212,6 @@ } else { StringRef Note = Case.getNote(); const NoteTag *Tag = C.getNoteTag( - // Sorry couldn't help myself. [Node, Note]() -> std::string { // Don't emit "Assuming..." note when we ended up // knowing in advance which branch is taken. diff --git a/clang/test/CXX/drs/dr16xx.cpp b/clang/test/CXX/drs/dr16xx.cpp --- a/clang/test/CXX/drs/dr16xx.cpp +++ b/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 { diff --git a/clang/test/Lexer/SourceLocationsOverflow.c b/clang/test/Lexer/SourceLocationsOverflow.c --- 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, 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) diff --git a/clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp b/clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp --- a/clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp +++ b/clang/test/SemaTemplate/temp_arg_nontype_cxx20.cpp @@ -8,8 +8,8 @@ // floating-point arguments template 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}} diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -11423,12 +11423,12 @@ verifyFormat("SomeType s [[gnu::unused]] (InitValue);"); verifyFormat("SomeType s [[using gnu: unused]] (InitValue);"); verifyFormat("[[gsl::suppress(\"clang-tidy-check-name\")]] void f() {}"); - verifyFormat("void f() [[deprecated(\"so sorry\")]];"); + verifyFormat("void f() [[deprecated]];"); verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n" " [[unused]] aaaaaaaaaaaaaaaaaaaaaaa(int i);"); verifyFormat("[[nodiscard]] bool f() { return false; }"); verifyFormat("class [[nodiscard]] f {\npublic:\n f() {}\n}"); - verifyFormat("class [[deprecated(\"so sorry\")]] f {\npublic:\n f() {}\n}"); + verifyFormat("class [[deprecated]] f {\npublic:\n f() {}\n}"); verifyFormat("class [[gnu::unused]] f {\npublic:\n f() {}\n}"); verifyFormat("[[nodiscard]] ::qualified_type f();"); @@ -22880,10 +22880,10 @@ EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.h", "array[[calculator getIndex]];")); EXPECT_EQ(FormatStyle::LK_Cpp, - guessLanguage("foo.h", "[[noreturn, deprecated(\"so sorry\")]];")); + guessLanguage("foo.h", "[[noreturn, deprecated]];")); EXPECT_EQ( FormatStyle::LK_Cpp, - guessLanguage("foo.h", "[[noreturn, deprecated(\"gone, sorry\")]];")); + guessLanguage("foo.h", "[[noreturn, deprecated]];")); EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.h", "[[noreturn foo] bar];")); EXPECT_EQ(FormatStyle::LK_Cpp, diff --git a/clang/www/demo/index.cgi b/clang/www/demo/index.cgi --- a/clang/www/demo/index.cgi +++ b/clang/www/demo/index.cgi @@ -270,7 +270,7 @@ alarm 0; }; if ( $@ and $@ =~ /timeout/ ) { - barf("Program $program took too long, compile time limited for the web script, sorry!\n"); + barf("Program $program took too long, compile time limited for the web script.\n"); } if ( -s $outputFile ) { print scalar dumpFile( "Output from $program", $outputFile ); @@ -286,7 +286,7 @@ if ( WIFSIGNALED($retcode) != 0 ) { my $sig = WTERMSIG($retcode); barf( - "Ouch, $program caught signal $sig. Sorry, better luck next time!\n" + "Ouch, $program caught signal $sig.\n" ); } } diff --git a/lldb/examples/synthetic/libcxx.py b/lldb/examples/synthetic/libcxx.py --- a/lldb/examples/synthetic/libcxx.py +++ b/lldb/examples/synthetic/libcxx.py @@ -609,7 +609,7 @@ if self.get_child_at_index(0): return self.get_child_at_index(index) else: - logger >> "item == 0 could not be found. sorry, nothing can be done here." + logger >> "item == 0 could not be found. Nothing can be done here." return None return current.CreateChildAtOffset( '[' + str(index) + ']', self.skip_size, self.data_type) diff --git a/llvm/include/llvm/CodeGen/MachinePassManager.h b/llvm/include/llvm/CodeGen/MachinePassManager.h --- a/llvm/include/llvm/CodeGen/MachinePassManager.h +++ b/llvm/include/llvm/CodeGen/MachinePassManager.h @@ -226,7 +226,7 @@ addRunOnModule(PassConceptT *Pass) { static_assert(is_detected::value, "machine module pass needs to define machine function pass " - "api. sorry."); + "api."); using PassModelT = detail::PassModel New = runPassesOn(Clone.get(), Passes); if (!New) { - errs() << "Instruction removal failed. Sorry. :( Please report a bug!\n"; + errs() << "Instruction removal failed. Please report a bug!\n"; exit(1); } return New; @@ -141,7 +141,7 @@ std::unique_ptr New = runPassesOn(M.get(), CleanupPasses); if (!New) { - errs() << "Final cleanups failed. Sorry. :( Please report a bug!\n"; + errs() << "Final cleanups failed. Please report a bug!\n"; return nullptr; } return New; @@ -155,7 +155,7 @@ if (!NewM) { outs() << "*** Loop extraction failed: "; EmitProgressBitcode(*M, "loopextraction", true); - outs() << "*** Sorry. :( Please report a bug!\n"; + outs() << "*** Please report a bug!\n"; return nullptr; } diff --git a/llvm/utils/check-each-file b/llvm/utils/check-each-file --- a/llvm/utils/check-each-file +++ b/llvm/utils/check-each-file @@ -120,7 +120,7 @@ $linker if $checker then - echo "Sorry, I can't help you, $program is OK when compiled with llvm-native-gcc" + echo "I cannot help you, $program is OK when compiled with llvm-native-gcc" exit 1 fi for f in $files diff --git a/polly/lib/External/isl/imath/tests/test.sh b/polly/lib/External/isl/imath/tests/test.sh --- a/polly/lib/External/isl/imath/tests/test.sh +++ b/polly/lib/External/isl/imath/tests/test.sh @@ -9,8 +9,8 @@ set -o pipefail if [ ! -f ../imtest ] ; then - echo "I can't find the imath test driver 'imtest', did you build it?" - echo "I can't proceed with the unit tests until you do so, sorry." + echo "The imath test driver 'imtest' was not found." + echo "It needs to be build before proceeding with the unit tests." exit 2 fi @@ -25,8 +25,8 @@ echo "" echo "-- Running test to compute 1024 decimal digits of pi" if [ ! -f ../pi ] ; then - echo "I can't find the pi computing program, did you build it?" - echo "I can't proceed with the pi test until you do so, sorry." + echo "The pi computing program was not found." + echo "It needs to be built before proceeding with the pi test." exit 1 fi