Rename warn_drv_overriding_flag_option (-Woverriding-t-option) to warn_drv_overriding_flag_option (-Woverriding-option)

[MaskRay]

Summary

warn_drv_overriding_flag_option was added for clang-cl /T* options (D1290) and its group name was planned to be renamed to overriding-option.
The name -Woverriding-t-option does not make sense for other uses,
mostly related to -ffp-model= related diagnostics.

[dexonsmith]

LGTM.

Perhaps as a follow-up, rename warn_drv_overriding_flag_option to have “t” in it?

[MaskRay]

In D158137#4594181, @dexonsmith wrote:

LGTM.

Perhaps as a follow-up, rename warn_drv_overriding_flag_option to have “t” in it?

Thanks! I agree. d9ad0681fad9a98f43d9baddb95d505b37153c48 (2013) renamed warn_drv_overriding_t_option to warn_drv_overriding_flag_option.
Perhaps the original name warn_drv_overriding_t_option should be restored.

[skan]

LGTM

[hans]

Thanks! I agree. d9ad0681fad9a98f43d9baddb95d505b37153c48 (2013) renamed warn_drv_overriding_t_option to warn_drv_overriding_flag_option.
Perhaps the original name warn_drv_overriding_t_option should be restored.

That change also started using it for overriding /MD and /MT. I think the intention then was to make the flag more general, but it forgot to rename the flag spelling. Perhaps the fix is really to s/overriding-t-option/overriding-option/ ? (If we're concerned about the interface change, we could retain an alias with the old spelling.)

[MaskRay]

In D158137#4595234, @hans wrote:

Thanks! I agree. d9ad0681fad9a98f43d9baddb95d505b37153c48 (2013) renamed warn_drv_overriding_t_option to warn_drv_overriding_flag_option.
Perhaps the original name warn_drv_overriding_t_option should be restored.

That change also started using it for overriding /MD and /MT. I think the intention then was to make the flag more general, but it forgot to rename the flag spelling. Perhaps the fix is really to s/overriding-t-option/overriding-option/ ? (If we're concerned about the interface change, we could retain an alias with the old spelling.)

s/overriding-t-option/overriding-option/ sounds good. I'll change the patch accordingly, but keep the warn_drv_overriding_option name (Some uses are not related to boolean flags).
I wish that we keep -Woverriding-t-option and -Woverriding-option different.

[MaskRay]

rename the diagnostic and group name

[dexonsmith]

This seems to drop -Woverriding-t-option entirely. Could that break builds if someone has (e.g.) -Werror -Wno-overriding-t-option in their build settings?

[MaskRay]

In D158137#4595927, @dexonsmith wrote:

This seems to drop -Woverriding-t-option entirely. Could that break builds if someone has (e.g.) -Werror -Wno-overriding-t-option in their build settings?

Yes. We could also add an ignored -Wno-overriding-t-option to Options.td. Users who want to ignore the existing diagnostics need to add -Wno-overriding-option now.
At some point we can add clang_ignored_legacy_options_Group to -Wno-overriding-option so that there will be a warning (error if -Werror)?

[MaskRay]

In D158137#4596111, @MaskRay wrote:

In D158137#4595927, @dexonsmith wrote:

This seems to drop -Woverriding-t-option entirely. Could that break builds if someone has (e.g.) -Werror -Wno-overriding-t-option in their build settings?

Yes. We could also add an ignored -Wno-overriding-t-option to Options.td. Users who want to ignore the existing diagnostics need to add -Wno-overriding-option now.
At some point we can add clang_ignored_legacy_options_Group to -Wno-overriding-option so that there will be a warning (error if -Werror)?

Even if we don't drop -Woverriding-t-option, as long as we make -Woverriding-t-option disconnected from the code we want to change (-ffp-model= related diagnostics), -Werror users will observe an error. It seems unavoidable for them to observe an error, unless we make overriding-t-option an alias for overriding-option (which we don't want to).

For non -Werror users, removing -Woverriding-t-option is not a problem. An unknown -W gives a warning.

[dexonsmith]

Can you explain the downside of leaving behind an alias?

[MaskRay]

In D158137#4596948, @dexonsmith wrote:

Can you explain the downside of leaving behind an alias?

Two minor ones. (a) Existing -Wno-overriding-t-option will not notice that they need to migrate and (b) Clang has accrued tiny tech debt.
If we eventually remove -Wno-overriding-t-option for tidiness, we will have to break -Werror -Wno-overriding-t-option users.

The difference is what error message we want to display:

// no change to Options.td
warning: unknown warning option '-Wno-overriding-t-option'; did you mean '-Wno-overriding-option'? [-Wunknown-warning-option]
// def : Flag<["-"], "Wno-overriding-t-option">, Flags<[Ignored]>;
warning: argument unused during compilation: '-Wno-overriding-t-option' [-Wunused-command-line-argument]

My understanding of -Werror users is that they may have to fix reasonable toolchain updates. Specifying -Wno-overriding-t-option for -ffp-model= and D41425 is odd in the first place.

https://gitlab.kitware.com/cmake/cmake/-/issues/20132 is probably the reason I want to keep -Wno-overriding-t-option for Darwin.cpp, even if the option name is strange.

[dexonsmith]

In D158137#4597009, @MaskRay wrote:

In D158137#4596948, @dexonsmith wrote:

Can you explain the downside of leaving behind an alias?

Two minor ones. (a) Existing -Wno-overriding-t-option will not notice that they need to migrate and (b) Clang has accrued tiny tech debt.
If we eventually remove -Wno-overriding-t-option for tidiness, we will have to break -Werror -Wno-overriding-t-option users.

I guess it's not clear to me we'd need to remove the alias. The usual policy (I think?) is that clang driver options don't disappear. It seems like a small piece of debt to maintain the extra alias in this case, and if it's kept, then users don't actually need to migrate. And then you can feel safe updating Darwin.cpp as well.

[MaskRay]

In D158137#4597491, @dexonsmith wrote:

In D158137#4597009, @MaskRay wrote:

In D158137#4596948, @dexonsmith wrote:

Can you explain the downside of leaving behind an alias?

Two minor ones. (a) Existing -Wno-overriding-t-option will not notice that they need to migrate and (b) Clang has accrued tiny tech debt.
If we eventually remove -Wno-overriding-t-option for tidiness, we will have to break -Werror -Wno-overriding-t-option users.

I guess it's not clear to me we'd need to remove the alias. The usual policy (I think?) is that clang driver options don't disappear. It seems like a small piece of debt to maintain the extra alias in this case, and if it's kept, then users don't actually need to migrate. And then you can feel safe updating Darwin.cpp as well.

-W* options are different from regular driver options in that -Wunknown-unknown-unknown leads to a warning instead of an error, while a regular unrecognized driver option leads to an error.
We deprecate driver options and make use of them warnings, and newer Clang generally emits more warnings. These would break -Werror users as well, but we still do them anyway if reasonable.

I understand that it is a small piece of debt, but my point is that we don't need the debt.

[dexonsmith]

In D158137#4597565, @MaskRay wrote:

In D158137#4597491, @dexonsmith wrote:

In D158137#4597009, @MaskRay wrote:

In D158137#4596948, @dexonsmith wrote:

Can you explain the downside of leaving behind an alias?

Two minor ones. (a) Existing -Wno-overriding-t-option will not notice that they need to migrate and (b) Clang has accrued tiny tech debt.
If we eventually remove -Wno-overriding-t-option for tidiness, we will have to break -Werror -Wno-overriding-t-option users.

I guess it's not clear to me we'd need to remove the alias. The usual policy (I think?) is that clang driver options don't disappear. It seems like a small piece of debt to maintain the extra alias in this case, and if it's kept, then users don't actually need to migrate. And then you can feel safe updating Darwin.cpp as well.

-W* options are different from regular driver options in that -Wunknown-unknown-unknown leads to a warning instead of an error, while a regular unrecognized driver option leads to an error.
We deprecate driver options and make use of them warnings, and newer Clang generally emits more warnings. These would break -Werror users as well, but we still do them anyway if reasonable.

I understand that it is a small piece of debt, but my point is that we don't need the debt.

Okay, fine by me if others are happy!

[hans]

lgtm

Maybe add a short release note.

[MaskRay]

add a release note about the renamed -W option

[dblaikie]

In D158137#4597491, @dexonsmith wrote:

In D158137#4597009, @MaskRay wrote:

In D158137#4596948, @dexonsmith wrote:

Can you explain the downside of leaving behind an alias?

Two minor ones. (a) Existing -Wno-overriding-t-option will not notice that they need to migrate and (b) Clang has accrued tiny tech debt.
If we eventually remove -Wno-overriding-t-option for tidiness, we will have to break -Werror -Wno-overriding-t-option users.

I guess it's not clear to me we'd need to remove the alias. The usual policy (I think?) is that clang driver options don't disappear. It seems like a small piece of debt to maintain the extra alias in this case, and if it's kept, then users don't actually need to migrate. And then you can feel safe updating Darwin.cpp as well.

+1 to this, FWIW - I wouldn't consider it technical debt to keep a compatible warning flag name that's been around for a decade & isn't a name we're trying to free up for some other use or because it causes any great confusion, etc.

[MaskRay]

In D158137#4599461, @dblaikie wrote:

In D158137#4597491, @dexonsmith wrote:

In D158137#4597009, @MaskRay wrote:

In D158137#4596948, @dexonsmith wrote:

Can you explain the downside of leaving behind an alias?

Two minor ones. (a) Existing -Wno-overriding-t-option will not notice that they need to migrate and (b) Clang has accrued tiny tech debt.
If we eventually remove -Wno-overriding-t-option for tidiness, we will have to break -Werror -Wno-overriding-t-option users.

I guess it's not clear to me we'd need to remove the alias. The usual policy (I think?) is that clang driver options don't disappear. It seems like a small piece of debt to maintain the extra alias in this case, and if it's kept, then users don't actually need to migrate. And then you can feel safe updating Darwin.cpp as well.

+1 to this, FWIW - I wouldn't consider it technical debt to keep a compatible warning flag name that's been around for a decade & isn't a name we're trying to free up for some other use or because it causes any great confusion, etc.

I think my previous comment has answered this.
Think: every Clang release may emit some new warnings. -Werror users has actually provided a promise that they will fix reasonable toolchain changes. Toolchain contributors check how disruptive a change will be, but cannot promise that we never emit new warnings.
In this case, overriding-t-options seems a fairly rare and LLVM/Clang side has far too many other fp-model/fast-math changes to make "whether we will get a new warning" a fairly minor issue.
I am unfamiliar with Darwin.cpp though. If it turns out that want to disable the warning even with -Wno-overriding-t-option, we can add a workaround specific to Darwin.cpp, but not to fp-model/Tc.

[dblaikie]

In D158137#4599481, @MaskRay wrote:

In D158137#4599461, @dblaikie wrote:

In D158137#4597491, @dexonsmith wrote:

In D158137#4597009, @MaskRay wrote:

In D158137#4596948, @dexonsmith wrote:

Can you explain the downside of leaving behind an alias?

Two minor ones. (a) Existing -Wno-overriding-t-option will not notice that they need to migrate and (b) Clang has accrued tiny tech debt.
If we eventually remove -Wno-overriding-t-option for tidiness, we will have to break -Werror -Wno-overriding-t-option users.

I guess it's not clear to me we'd need to remove the alias. The usual policy (I think?) is that clang driver options don't disappear. It seems like a small piece of debt to maintain the extra alias in this case, and if it's kept, then users don't actually need to migrate. And then you can feel safe updating Darwin.cpp as well.

+1 to this, FWIW - I wouldn't consider it technical debt to keep a compatible warning flag name that's been around for a decade & isn't a name we're trying to free up for some other use or because it causes any great confusion, etc.

I think my previous comment has answered this.
Think: every Clang release may emit some new warnings. -Werror users has actually provided a promise that they will fix reasonable toolchain changes. Toolchain contributors check how disruptive a change will be, but cannot promise that we never emit new warnings.
In this case, overriding-t-options seems a fairly rare and LLVM/Clang side has far too many other fp-model/fast-math changes to make "whether we will get a new warning" a fairly minor issue.
I am unfamiliar with Darwin.cpp though. If it turns out that want to disable the warning even with -Wno-overriding-t-option, we can add a workaround specific to Darwin.cpp, but not to fp-model/Tc.

Sure, I understand that we can break these things - like if we totally remove a warning, I wouldn't be averse to removing the flag/not leaving it there for backwards "compatibility" (when it's misleading/doesn't actually trigger the warning, for instance). But in this case it seems like we're keeping the functionality, decided on a better name, but it seems pretty harmless and somewhat beneficial to keep the old name around.

[aaron.ballman]

In D158137#4599546, @dblaikie wrote:

In D158137#4599481, @MaskRay wrote:

In D158137#4599461, @dblaikie wrote:

In D158137#4597491, @dexonsmith wrote:

In D158137#4597009, @MaskRay wrote:

In D158137#4596948, @dexonsmith wrote:

Can you explain the downside of leaving behind an alias?

Two minor ones. (a) Existing -Wno-overriding-t-option will not notice that they need to migrate and (b) Clang has accrued tiny tech debt.
If we eventually remove -Wno-overriding-t-option for tidiness, we will have to break -Werror -Wno-overriding-t-option users.

I guess it's not clear to me we'd need to remove the alias. The usual policy (I think?) is that clang driver options don't disappear. It seems like a small piece of debt to maintain the extra alias in this case, and if it's kept, then users don't actually need to migrate. And then you can feel safe updating Darwin.cpp as well.

+1 to this, FWIW - I wouldn't consider it technical debt to keep a compatible warning flag name that's been around for a decade & isn't a name we're trying to free up for some other use or because it causes any great confusion, etc.

I think my previous comment has answered this.
Think: every Clang release may emit some new warnings. -Werror users has actually provided a promise that they will fix reasonable toolchain changes. Toolchain contributors check how disruptive a change will be, but cannot promise that we never emit new warnings.
In this case, overriding-t-options seems a fairly rare and LLVM/Clang side has far too many other fp-model/fast-math changes to make "whether we will get a new warning" a fairly minor issue.
I am unfamiliar with Darwin.cpp though. If it turns out that want to disable the warning even with -Wno-overriding-t-option, we can add a workaround specific to Darwin.cpp, but not to fp-model/Tc.

Sure, I understand that we can break these things - like if we totally remove a warning, I wouldn't be averse to removing the flag/not leaving it there for backwards "compatibility" (when it's misleading/doesn't actually trigger the warning, for instance). But in this case it seems like we're keeping the functionality, decided on a better name, but it seems pretty harmless and somewhat beneficial to keep the old name around.

IMO, the less friction we make for users doing an upgrade, the better. I tend to agree with @dblaikie that it might be reasonable to leave the old flag around as an alias for the new flag (we can document a preference for the new name if it makes us feel better).

clang/docs/ReleaseNotes.rst

 ------------------
 
 Deprecated Compiler Flags
 -------------------------
 
 Modified Compiler Flags
 -----------------------
 
+* ``-Woverriding-t-option`` is renamed to ``-Woverriding-option``.
+
 Removed Compiler Flags
 -------------------------
 
 Attribute Changes in Clang
 --------------------------
 
 Improvements to Clang's diagnostics
 -----------------------------------

clang/include/clang/Basic/DiagnosticDriverKinds.td

 def warn_drv_unsupported_float_abi_by_lib : Warning<
   "float ABI '%0' is not supported by current library">,
   InGroup<UnsupportedABI>;
 def warn_drv_no_floating_point_registers: Warning<
   "'%0': selected processor lacks floating point registers">,
   InGroup<UnsupportedABI>;
 def warn_ignoring_ftabstop_value : Warning<
   "ignoring invalid -ftabstop value '%0', using default value %1">;
-def warn_drv_overriding_flag_option : Warning<
+def warn_drv_overriding_option : Warning<
   "overriding '%0' option with '%1'">,
-  InGroup<DiagGroup<"overriding-t-option">>;
+  InGroup<DiagGroup<"overriding-option">>;
 def warn_drv_treating_input_as_cxx : Warning<
   "treating '%0' input as '%1' when in C++ mode, this behavior is deprecated">,
   InGroup<Deprecated>;
 def warn_drv_pch_not_first_include : Warning<
   "precompiled header '%0' was ignored because '%1' is not first '-include'">;
 def warn_missing_sysroot : Warning<"no such sysroot directory: '%0'">,
   InGroup<DiagGroup<"missing-sysroot">>;
 def warn_incompatible_sysroot : Warning<"using sysroot for '%0' but targeting '%1'">,

clang/lib/Driver/Driver.cpp

InputType = TCTP->getOption().matches(options::OPT__SLASH_TC)
                     ? types::TY_C
                     : types::TY_CXX;
 
     Arg *Previous = nullptr;
     bool ShowNote = false;
     for (Arg *A :
          Args.filtered(options::OPT__SLASH_TC, options::OPT__SLASH_TP)) {
       if (Previous) {
-        Diag(clang::diag::warn_drv_overriding_flag_option)
+        Diag(clang::diag::warn_drv_overriding_option)
             << Previous->getSpelling() << A->getSpelling();
         ShowNote = true;
       }
       Previous = A;
     }
     if (ShowNote)
       Diag(clang::diag::note_drv_t_option_is_global);
   }
 

clang/lib/Driver/ToolChains/Clang.cpp

case options::OPT_ffp_model_EQ: {
 
       // FIXME: The target may have picked a non-IEEE default mode here based on
       // -cl-denorms-are-zero. Should the target consider -fp-model interaction?
       DenormalFP32Math = llvm::DenormalMode::getIEEE();
 
       StringRef Val = A->getValue();
       if (OFastEnabled && !Val.equals("fast")) {
           // Only -ffp-model=fast is compatible with OFast, ignore.
-        D.Diag(clang::diag::warn_drv_overriding_flag_option)
-          << Args.MakeArgString("-ffp-model=" + Val)
-          << "-Ofast";
+        D.Diag(clang::diag::warn_drv_overriding_option)
+            << Args.MakeArgString("-ffp-model=" + Val) << "-Ofast";
         break;
       }
       StrictFPModel = false;
       PreciseFPModel = true;
       // ffp-model= is a Driver option, it is entirely rewritten into more
       // granular options before being passed into cc1.
       // Use the gcc option in the switch below.
       if (!FPModel.empty() && !FPModel.equals(Val))
-        D.Diag(clang::diag::warn_drv_overriding_flag_option)
+        D.Diag(clang::diag::warn_drv_overriding_option)
             << Args.MakeArgString("-ffp-model=" + FPModel)
             << Args.MakeArgString("-ffp-model=" + Val);
       if (Val.equals("fast")) {
         optID = options::OPT_ffast_math;
         FPModel = Val;
         FPContract = "fast";
       } else if (Val.equals("precise")) {
         optID = options::OPT_ffp_contract;
for (const Arg *A : Args) {
     case options::OPT_freciprocal_math:     ReciprocalMath = true;    break;
     case options::OPT_fno_reciprocal_math:  ReciprocalMath = false;   break;
     case options::OPT_fsigned_zeros:        SignedZeros = true;       break;
     case options::OPT_fno_signed_zeros:     SignedZeros = false;      break;
     case options::OPT_ftrapping_math:
       if (!TrappingMathPresent && !FPExceptionBehavior.empty() &&
           !FPExceptionBehavior.equals("strict"))
         // Warn that previous value of option is overridden.
-        D.Diag(clang::diag::warn_drv_overriding_flag_option)
-          << Args.MakeArgString("-ffp-exception-behavior=" + FPExceptionBehavior)
+        D.Diag(clang::diag::warn_drv_overriding_option)
+            << Args.MakeArgString("-ffp-exception-behavior=" +
+                                  FPExceptionBehavior)
             << "-ftrapping-math";
       TrappingMath = true;
       TrappingMathPresent = true;
       FPExceptionBehavior = "strict";
       break;
     case options::OPT_fno_trapping_math:
       if (!TrappingMathPresent && !FPExceptionBehavior.empty() &&
           !FPExceptionBehavior.equals("ignore"))
         // Warn that previous value of option is overridden.
-        D.Diag(clang::diag::warn_drv_overriding_flag_option)
-          << Args.MakeArgString("-ffp-exception-behavior=" + FPExceptionBehavior)
+        D.Diag(clang::diag::warn_drv_overriding_option)
+            << Args.MakeArgString("-ffp-exception-behavior=" +
+                                  FPExceptionBehavior)
             << "-fno-trapping-math";
       TrappingMath = false;
       TrappingMathPresent = true;
       FPExceptionBehavior = "ignore";
       break;
 
     case options::OPT_frounding_math:
       RoundingFPMath = true;
       RoundingMathPresent = true;
case options::OPT_ffp_model_EQ:
       break;
 
     // Validate and pass through -ffp-exception-behavior option.
     case options::OPT_ffp_exception_behavior_EQ: {
       StringRef Val = A->getValue();
       if (!TrappingMathPresent && !FPExceptionBehavior.empty() &&
           !FPExceptionBehavior.equals(Val))
         // Warn that previous value of option is overridden.
-        D.Diag(clang::diag::warn_drv_overriding_flag_option)
-          << Args.MakeArgString("-ffp-exception-behavior=" + FPExceptionBehavior)
+        D.Diag(clang::diag::warn_drv_overriding_option)
+            << Args.MakeArgString("-ffp-exception-behavior=" +
+                                  FPExceptionBehavior)
             << Args.MakeArgString("-ffp-exception-behavior=" + Val);
       TrappingMath = TrappingMathPresent = false;
       if (Val.equals("ignore") || Val.equals("maytrap"))
         FPExceptionBehavior = Val;
       else if (Val.equals("strict")) {
         FPExceptionBehavior = Val;
         TrappingMath = TrappingMathPresent = true;
       } else
         D.Diag(diag::err_drv_unsupported_option_argument)
if (StrictFPModel) {
         ;
       else {
         StrictFPModel = false;
         FPModel = "";
         auto RHS = (A->getNumValues() == 0)
                        ? A->getSpelling()
                        : Args.MakeArgString(A->getSpelling() + A->getValue());
         if (RHS != "-ffp-model=strict")
-          D.Diag(clang::diag::warn_drv_overriding_flag_option)
+          D.Diag(clang::diag::warn_drv_overriding_option)
               << "-ffp-model=strict" << RHS;
       }
     }
 
     // If we handled this option claim it
     A->claim();
   }
 
if (!HonorINFs && !HonorNaNs && !MathErrno && AssociativeMath && ApproxFunc &&
     if (FPModel.equals("fast")) {
       if (FPContract.equals("fast"))
         // All set, do nothing.
         ;
       else if (FPContract.empty())
         // Enable -ffp-contract=fast
         CmdArgs.push_back(Args.MakeArgString("-ffp-contract=fast"));
       else
-        D.Diag(clang::diag::warn_drv_overriding_flag_option)
+        D.Diag(clang::diag::warn_drv_overriding_option)
             << "-ffp-model=fast"
             << Args.MakeArgString("-ffp-contract=" + FPContract);
     }
   }
 
   // Handle __FINITE_MATH_ONLY__ similarly.
   if (!HonorINFs && !HonorNaNs)
     CmdArgs.push_back("-ffinite-math-only");
 
   if (const Arg *A = Args.getLastArg(options::OPT_mfpmath_EQ)) {

clang/lib/Driver/ToolChains/Darwin.cpp

if (OSVersionArgTarget) {
             !OSTarget->hasOSVersion()) {
           OSTarget->setOSVersion(OSVersionArgTarget->getOSVersion());
         } else {
           // Warn about -m<os>-version-min that doesn't match the OS version
           // that's specified in the target.
           std::string OSVersionArg =
               OSVersionArgTarget->getAsString(Args, Opts);
           std::string TargetArg = OSTarget->getAsString(Args, Opts);
-          getDriver().Diag(clang::diag::warn_drv_overriding_flag_option)
+          getDriver().Diag(clang::diag::warn_drv_overriding_option)
               << OSVersionArg << TargetArg;
         }
       }
     }
   } else if ((OSTarget = getDeploymentTargetFromMTargetOSArg(Args, getDriver(),
                                                              SDKInfo))) {
     // The OS target can be specified using the -mtargetos= argument.
     // Disallow mixing -mtargetos= and -m<os>version-min=.

clang/test/Driver/fp-model.c

 // Test that incompatible combinations of -ffp-model= options
 // and other floating point options get a warning diagnostic.
 //
 
 // RUN: %clang -### -ffp-model=fast -ffp-contract=off -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN %s
-// WARN: warning: overriding '-ffp-model=fast' option with '-ffp-contract=off' [-Woverriding-t-option]
+// WARN: warning: overriding '-ffp-model=fast' option with '-ffp-contract=off' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=fast -ffp-contract=on -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN1 %s
-// WARN1: warning: overriding '-ffp-model=fast' option with '-ffp-contract=on' [-Woverriding-t-option]
+// WARN1: warning: overriding '-ffp-model=fast' option with '-ffp-contract=on' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -fassociative-math -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN2 %s
-// WARN2: warning: overriding '-ffp-model=strict' option with '-fassociative-math' [-Woverriding-t-option]
+// WARN2: warning: overriding '-ffp-model=strict' option with '-fassociative-math' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -ffast-math -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN3 %s
-// WARN3: warning: overriding '-ffp-model=strict' option with '-ffast-math' [-Woverriding-t-option]
+// WARN3: warning: overriding '-ffp-model=strict' option with '-ffast-math' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -ffinite-math-only -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN4 %s
-// WARN4: warning: overriding '-ffp-model=strict' option with '-ffinite-math-only' [-Woverriding-t-option]
+// WARN4: warning: overriding '-ffp-model=strict' option with '-ffinite-math-only' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -ffp-contract=fast -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN5 %s
-// WARN5: warning: overriding '-ffp-model=strict' option with '-ffp-contract=fast' [-Woverriding-t-option]
+// WARN5: warning: overriding '-ffp-model=strict' option with '-ffp-contract=fast' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -ffp-contract=on -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN7 %s
-// WARN7: warning: overriding '-ffp-model=strict' option with '-ffp-contract=on' [-Woverriding-t-option]
+// WARN7: warning: overriding '-ffp-model=strict' option with '-ffp-contract=on' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -fno-honor-infinities -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN8 %s
-// WARN8: warning: overriding '-ffp-model=strict' option with '-fno-honor-infinities' [-Woverriding-t-option]
+// WARN8: warning: overriding '-ffp-model=strict' option with '-fno-honor-infinities' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -fno-honor-nans -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN9 %s
-// WARN9: warning: overriding '-ffp-model=strict' option with '-fno-honor-nans' [-Woverriding-t-option]
+// WARN9: warning: overriding '-ffp-model=strict' option with '-fno-honor-nans' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -fno-rounding-math -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARNa %s
-// WARNa: warning: overriding '-ffp-model=strict' option with '-fno-rounding-math' [-Woverriding-t-option]
+// WARNa: warning: overriding '-ffp-model=strict' option with '-fno-rounding-math' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -fno-signed-zeros -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARNb %s
-// WARNb: warning: overriding '-ffp-model=strict' option with '-fno-signed-zeros' [-Woverriding-t-option]
+// WARNb: warning: overriding '-ffp-model=strict' option with '-fno-signed-zeros' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -fno-trapping-math -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARNc %s
-// WARNc: warning: overriding '-ffp-model=strict' option with '-fno-trapping-math' [-Woverriding-t-option]
+// WARNc: warning: overriding '-ffp-model=strict' option with '-fno-trapping-math' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -freciprocal-math -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARNd %s
-// WARNd: warning: overriding '-ffp-model=strict' option with '-freciprocal-math' [-Woverriding-t-option]
+// WARNd: warning: overriding '-ffp-model=strict' option with '-freciprocal-math' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -funsafe-math-optimizations -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARNe %s
-// WARNe: warning: overriding '-ffp-model=strict' option with '-funsafe-math-optimizations' [-Woverriding-t-option]
+// WARNe: warning: overriding '-ffp-model=strict' option with '-funsafe-math-optimizations' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -Ofast -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARNf %s
-// WARNf: warning: overriding '-ffp-model=strict' option with '-Ofast' [-Woverriding-t-option]
+// WARNf: warning: overriding '-ffp-model=strict' option with '-Ofast' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -fdenormal-fp-math=preserve-sign,preserve-sign -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN10 %s
-// WARN10: warning: overriding '-ffp-model=strict' option with '-fdenormal-fp-math=preserve-sign,preserve-sign' [-Woverriding-t-option]
+// WARN10: warning: overriding '-ffp-model=strict' option with '-fdenormal-fp-math=preserve-sign,preserve-sign' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=fast -ffp-model=strict -c %s 2>&1 | FileCheck \
 // RUN:   --check-prefix=WARN11 %s
-// WARN11: warning: overriding '-ffp-model=fast' option with '-ffp-model=strict' [-Woverriding-t-option]
-// WARN11-NOT: warning: overriding '-ffp-model=strict' option with '-ffp-model=strict' [-Woverriding-t-option]
+// WARN11: warning: overriding '-ffp-model=fast' option with '-ffp-model=strict' [-Woverriding-option]
+// WARN11-NOT: warning: overriding '-ffp-model=strict' option with '-ffp-model=strict' [-Woverriding-option]
 
 // RUN: %clang -### -Ofast -ffp-model=strict -c %s 2>&1 | FileCheck \
 // RUN:   --check-prefix=WARN12 %s
 // RUN: %clang -### -ffast-math -ffp-model=strict -c %s 2>&1 | FileCheck \
 // RUN:   --check-prefix=WARN12 %s
-// WARN12-NOT: warning: overriding '-ffp-model=strict' option with '-ffp-model=strict' [-Woverriding-t-option]
+// WARN12-NOT: warning: overriding '-ffp-model=strict' option with '-ffp-model=strict' [-Woverriding-option]
 
 // RUN: %clang -### -ffp-model=strict -fapprox-func -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN13 %s
-// WARN13: warning: overriding '-ffp-model=strict' option with '-fapprox-func' [-Woverriding-t-option]
+// WARN13: warning: overriding '-ffp-model=strict' option with '-fapprox-func' [-Woverriding-option]
 
 // RUN: %clang -### -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-NOROUND %s
 // CHECK-NOROUND: "-cc1"
 // CHECK-NOROUND: "-fno-rounding-math"
 
 // RUN: %clang -### -frounding-math -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-ROUND --implicit-check-not ffp-exception-behavior=strict %s