diff --git a/clang/include/clang/Basic/DiagnosticASTKinds.td b/clang/include/clang/Basic/DiagnosticASTKinds.td index 856293dd45d08..566cdc3406058 100644 --- a/clang/include/clang/Basic/DiagnosticASTKinds.td +++ b/clang/include/clang/Basic/DiagnosticASTKinds.td @@ -781,7 +781,7 @@ def err_module_odr_violation_field : Error< "%select{non-|}5bitfield %4|" "bitfield %4 with one width expression|" "%select{non-|}5mutable field %4|" - "field %4 with %select{no|an}5 initalizer|" + "field %4 with %select{no|an}5 initializer|" "field %4 with an initializer" "}3">; def note_module_odr_violation_field : Note< diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 7ca9102018184..eea4d4961c077 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -2671,7 +2671,7 @@ def note_immediate_function_reason : Note< "expression}3">; def note_invalid_consteval_initializer : Note< - "in the default initalizer of %0">; + "in the default initializer of %0">; def note_invalid_consteval_initializer_here : Note< "initialized here %0">; def err_invalid_consteval_decl_kind : Error< @@ -9660,7 +9660,7 @@ def note_lambda_capture_initializer : Note< "%select{implicitly |}2captured%select{| by reference}3" "%select{%select{ due to use|}2 here|" " via initialization of lambda capture %0}1">; -def note_init_with_default_member_initalizer : Note< +def note_init_with_default_member_initializer : Note< "initializing field %0 with default member initializer">; // Check for initializing a member variable with the address or a reference to diff --git a/clang/lib/CodeGen/CGDeclCXX.cpp b/clang/lib/CodeGen/CGDeclCXX.cpp index 8a77ffeed52f7..be8fb6c274db1 100644 --- a/clang/lib/CodeGen/CGDeclCXX.cpp +++ b/clang/lib/CodeGen/CGDeclCXX.cpp @@ -643,7 +643,7 @@ void CodeGenModule::EmitCXXThreadLocalInitFunc() { This is arranged to be run only once regardless of how many times the module might be included transitively. This arranged by using a guard variable. - If there are no initalizers at all (and also no imported modules) we reduce + If there are no initializers at all (and also no imported modules) we reduce this to an empty function (since the Itanium ABI requires that this function be available to a caller, which might be produced by a different implementation). diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index e3cbcd6795ea6..7a4e154cb2611 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -19601,7 +19601,7 @@ static void CheckForDuplicateEnumValues(Sema &S, ArrayRef Elements, return; } - // Constants with initalizers are handled in the next loop. + // Constants with initializers are handled in the next loop. if (ECD->getInitExpr()) continue; diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 71d59a64fb576..89fd56fb660b8 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -8282,7 +8282,7 @@ void Sema::checkInitializerLifetime(const InitializedEntity &Entity, case IndirectLocalPathEntry::DefaultInit: { auto *FD = cast(Elem.D); - Diag(FD->getLocation(), diag::note_init_with_default_member_initalizer) + Diag(FD->getLocation(), diag::note_init_with_default_member_initializer) << FD << nextPathEntryRange(Path, I + 1, L); break; } diff --git a/clang/test/Modules/odr_hash.cpp b/clang/test/Modules/odr_hash.cpp index fffac5e318f5d..c5bf6e873e52e 100644 --- a/clang/test/Modules/odr_hash.cpp +++ b/clang/test/Modules/odr_hash.cpp @@ -334,7 +334,7 @@ struct S10 { }; #else S10 s10; -// expected-error@second.h:* {{'Field::S10' has different definitions in different modules; first difference is definition in module 'SecondModule' found field 'x' with no initalizer}} +// expected-error@second.h:* {{'Field::S10' has different definitions in different modules; first difference is definition in module 'SecondModule' found field 'x' with no initializer}} // expected-note@first.h:* {{but in 'FirstModule' found field 'x' with an initializer}} #endif diff --git a/clang/test/SemaCXX/cxx2a-consteval-default-params.cpp b/clang/test/SemaCXX/cxx2a-consteval-default-params.cpp index c9a0ae9dd27b6..da8315a28bbca 100644 --- a/clang/test/SemaCXX/cxx2a-consteval-default-params.cpp +++ b/clang/test/SemaCXX/cxx2a-consteval-default-params.cpp @@ -20,7 +20,7 @@ int check_lambdas_used( // expected-note {{declared here}} \ // expected-note {{undefined function 'undefined'}} return defaulted; - }(), // expected-note {{in the default initalizer of 'defaulted'}} + }(), // expected-note {{in the default initializer of 'defaulted'}} int d = [](int defaulted = sizeof(undefined())) { return defaulted; }()