Skip to content

Commit b72cda2

Browse files
committed
[Diagnostics] Fix typo in 'overridden' warning message and identifier
1 parent cca0bf6 commit b72cda2

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

include/swift/AST/DiagnosticsFrontend.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ WARNING(ignoring_option_obsolete,none,
195195
"ignoring '%0'; this option is obsolete", (StringRef))
196196
WARNING(ignoring_option_requires_option,none,
197197
"ignoring %0 (requires %1)", (StringRef, StringRef))
198-
WARNING(warn_ignore_option_overriden_by,none,
199-
"ignoring %0 (overriden by %1)", (StringRef, StringRef))
198+
WARNING(warn_ignore_option_overridden_by,none,
199+
"ignoring %0 (overridden by %1)", (StringRef, StringRef))
200200

201201
WARNING(warn_implicit_concurrency_import_failed,none,
202202
"unable to perform implicit import of \"_Concurrency\" module: no such module found", ())

lib/Frontend/CompilerInvocation.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,7 +1487,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
14871487
if (Opts.AllowNonResilientAccess) {
14881488
// Override the option to skip non-exportable decls.
14891489
if (Opts.SkipNonExportableDecls) {
1490-
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overriden_by,
1490+
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overridden_by,
14911491
"-experimental-skip-non-exportable-decls",
14921492
"-allow-non-resilient-access");
14931493
Opts.SkipNonExportableDecls = false;
@@ -1498,7 +1498,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
14981498
FrontendOpts.RequestedAction)) {
14991499
if (FrontendOpts.RequestedAction !=
15001500
FrontendOptions::ActionType::TypecheckModuleFromInterface)
1501-
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overriden_by,
1501+
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overridden_by,
15021502
"-allow-non-resilient-access",
15031503
"-compile-module-from-interface");
15041504
Opts.AllowNonResilientAccess = false;
@@ -1960,7 +1960,7 @@ static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,
19601960
if (Args.hasArg(
19611961
OPT_experimental_skip_non_inlinable_function_bodies_without_types)) {
19621962
if (LangOpts.AllowNonResilientAccess)
1963-
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overriden_by,
1963+
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overridden_by,
19641964
"-experimental-skip-non-inlinable-function-bodies-without-types",
19651965
"-allow-non-resilient-access");
19661966
else
@@ -1971,7 +1971,7 @@ static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,
19711971
// body skipping.
19721972
if (Args.hasArg(OPT_experimental_skip_non_inlinable_function_bodies)) {
19731973
if (LangOpts.AllowNonResilientAccess)
1974-
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overriden_by,
1974+
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overridden_by,
19751975
"-experimental-skip-non-inlinable-function-bodies",
19761976
"-allow-non-resilient-access");
19771977
else
@@ -1980,7 +1980,7 @@ static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,
19801980

19811981
if (Args.hasArg(OPT_tbd_is_installapi)) {
19821982
if (LangOpts.AllowNonResilientAccess)
1983-
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overriden_by,
1983+
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overridden_by,
19841984
"-tbd-is-installapi",
19851985
"-allow-non-resilient-access");
19861986
else
@@ -1989,7 +1989,7 @@ static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,
19891989

19901990
if (Args.hasArg(OPT_experimental_skip_all_function_bodies)) {
19911991
if (LangOpts.AllowNonResilientAccess)
1992-
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overriden_by,
1992+
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overridden_by,
19931993
"-experimental-skip-all-function-bodies",
19941994
"-allow-non-resilient-access");
19951995
else
@@ -2063,7 +2063,7 @@ static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,
20632063

20642064
if (LangOpts.AllowNonResilientAccess &&
20652065
Opts.EnableLazyTypecheck) {
2066-
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overriden_by,
2066+
Diags.diagnose(SourceLoc(), diag::warn_ignore_option_overridden_by,
20672067
"-experimental-lazy-typecheck",
20682068
"-allow-non-resilient-access");
20692069
Opts.EnableLazyTypecheck = false;

0 commit comments

Comments
 (0)