Rename warn_drv_overriding_flag_option (-Woverriding-t-option) to warn_drv_overriding_flag_option (-Woverriding-option)
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. Reviewed By: hans, skan, dexonsmith Differential Revision: https://reviews.llvm.org/D158137
This commit is contained in:
Fangrui Song
parent
89053e4959
commit
1c66d08b01
6 changed files with 46 additions and 42 deletions
|
|
@ -122,6 +122,8 @@ Deprecated Compiler Flags
|
|||
Modified Compiler Flags
|
||||
-----------------------
|
||||
|
||||
* ``-Woverriding-t-option`` is renamed to ``-Woverriding-option``.
|
||||
|
||||
Removed Compiler Flags
|
||||
-------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -425,9 +425,9 @@ def warn_drv_no_floating_point_registers: Warning<
|
|||
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>;
|
||||
|
|
|
|||
|
|
@ -2591,8 +2591,8 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
|
|||
for (Arg *A :
|
||||
Args.filtered(options::OPT__SLASH_TC, options::OPT__SLASH_TP)) {
|
||||
if (Previous) {
|
||||
Diag(clang::diag::warn_drv_overriding_flag_option)
|
||||
<< Previous->getSpelling() << A->getSpelling();
|
||||
Diag(clang::diag::warn_drv_overriding_option)
|
||||
<< Previous->getSpelling() << A->getSpelling();
|
||||
ShowNote = true;
|
||||
}
|
||||
Previous = A;
|
||||
|
|
|
|||
|
|
@ -2840,9 +2840,8 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
|
|||
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;
|
||||
|
|
@ -2851,7 +2850,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
|
|||
// 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")) {
|
||||
|
|
@ -2900,9 +2899,10 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
|
|||
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)
|
||||
<< "-ftrapping-math";
|
||||
D.Diag(clang::diag::warn_drv_overriding_option)
|
||||
<< Args.MakeArgString("-ffp-exception-behavior=" +
|
||||
FPExceptionBehavior)
|
||||
<< "-ftrapping-math";
|
||||
TrappingMath = true;
|
||||
TrappingMathPresent = true;
|
||||
FPExceptionBehavior = "strict";
|
||||
|
|
@ -2911,9 +2911,10 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
|
|||
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)
|
||||
<< "-fno-trapping-math";
|
||||
D.Diag(clang::diag::warn_drv_overriding_option)
|
||||
<< Args.MakeArgString("-ffp-exception-behavior=" +
|
||||
FPExceptionBehavior)
|
||||
<< "-fno-trapping-math";
|
||||
TrappingMath = false;
|
||||
TrappingMathPresent = true;
|
||||
FPExceptionBehavior = "ignore";
|
||||
|
|
@ -2976,9 +2977,10 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
|
|||
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)
|
||||
<< Args.MakeArgString("-ffp-exception-behavior=" + Val);
|
||||
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;
|
||||
|
|
@ -3124,7 +3126,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
|
|||
? 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;
|
||||
}
|
||||
}
|
||||
|
|
@ -3218,9 +3220,9 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
|
|||
// Enable -ffp-contract=fast
|
||||
CmdArgs.push_back(Args.MakeArgString("-ffp-contract=fast"));
|
||||
else
|
||||
D.Diag(clang::diag::warn_drv_overriding_flag_option)
|
||||
<< "-ffp-model=fast"
|
||||
<< Args.MakeArgString("-ffp-contract=" + FPContract);
|
||||
D.Diag(clang::diag::warn_drv_overriding_option)
|
||||
<< "-ffp-model=fast"
|
||||
<< Args.MakeArgString("-ffp-contract=" + FPContract);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2204,7 +2204,7 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
|
|||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,82 +4,82 @@
|
|||
|
||||
// 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
|
||||
|
|
|
|||
Loading…
Reference in a new issue