Skip to content

Commit 1c66d08

Browse files
MaskRayMaskRay
committed
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
1 parent 89053e4 commit 1c66d08

File tree

6 files changed

+46
-42
lines changed

6 files changed

+46
-42
lines changed

‎clang/docs/ReleaseNotes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ Deprecated Compiler Flags
122122
Modified Compiler Flags
123123
-----------------------
124124

125+
* ``-Woverriding-t-option`` is renamed to ``-Woverriding-option``.
126+
125127
Removed Compiler Flags
126128
-------------------------
127129

‎clang/include/clang/Basic/DiagnosticDriverKinds.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,9 @@ def warn_drv_no_floating_point_registers: Warning<
425425
InGroup<UnsupportedABI>;
426426
def warn_ignoring_ftabstop_value : Warning<
427427
"ignoring invalid -ftabstop value '%0', using default value %1">;
428-
def warn_drv_overriding_flag_option : Warning<
428+
def warn_drv_overriding_option : Warning<
429429
"overriding '%0' option with '%1'">,
430-
InGroup<DiagGroup<"overriding-t-option">>;
430+
InGroup<DiagGroup<"overriding-option">>;
431431
def warn_drv_treating_input_as_cxx : Warning<
432432
"treating '%0' input as '%1' when in C++ mode, this behavior is deprecated">,
433433
InGroup<Deprecated>;

‎clang/lib/Driver/Driver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2591,8 +2591,8 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
25912591
for (Arg *A :
25922592
Args.filtered(options::OPT__SLASH_TC, options::OPT__SLASH_TP)) {
25932593
if (Previous) {
2594-
Diag(clang::diag::warn_drv_overriding_flag_option)
2595-
<< Previous->getSpelling() << A->getSpelling();
2594+
Diag(clang::diag::warn_drv_overriding_option)
2595+
<< Previous->getSpelling() << A->getSpelling();
25962596
ShowNote = true;
25972597
}
25982598
Previous = A;

‎clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2840,9 +2840,8 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
28402840
StringRef Val = A->getValue();
28412841
if (OFastEnabled && !Val.equals("fast")) {
28422842
// Only -ffp-model=fast is compatible with OFast, ignore.
2843-
D.Diag(clang::diag::warn_drv_overriding_flag_option)
2844-
<< Args.MakeArgString("-ffp-model=" + Val)
2845-
<< "-Ofast";
2843+
D.Diag(clang::diag::warn_drv_overriding_option)
2844+
<< Args.MakeArgString("-ffp-model=" + Val) << "-Ofast";
28462845
break;
28472846
}
28482847
StrictFPModel = false;
@@ -2851,7 +2850,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
28512850
// granular options before being passed into cc1.
28522851
// Use the gcc option in the switch below.
28532852
if (!FPModel.empty() && !FPModel.equals(Val))
2854-
D.Diag(clang::diag::warn_drv_overriding_flag_option)
2853+
D.Diag(clang::diag::warn_drv_overriding_option)
28552854
<< Args.MakeArgString("-ffp-model=" + FPModel)
28562855
<< Args.MakeArgString("-ffp-model=" + Val);
28572856
if (Val.equals("fast")) {
@@ -2900,9 +2899,10 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
29002899
if (!TrappingMathPresent && !FPExceptionBehavior.empty() &&
29012900
!FPExceptionBehavior.equals("strict"))
29022901
// Warn that previous value of option is overridden.
2903-
D.Diag(clang::diag::warn_drv_overriding_flag_option)
2904-
<< Args.MakeArgString("-ffp-exception-behavior=" + FPExceptionBehavior)
2905-
<< "-ftrapping-math";
2902+
D.Diag(clang::diag::warn_drv_overriding_option)
2903+
<< Args.MakeArgString("-ffp-exception-behavior=" +
2904+
FPExceptionBehavior)
2905+
<< "-ftrapping-math";
29062906
TrappingMath = true;
29072907
TrappingMathPresent = true;
29082908
FPExceptionBehavior = "strict";
@@ -2911,9 +2911,10 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
29112911
if (!TrappingMathPresent && !FPExceptionBehavior.empty() &&
29122912
!FPExceptionBehavior.equals("ignore"))
29132913
// Warn that previous value of option is overridden.
2914-
D.Diag(clang::diag::warn_drv_overriding_flag_option)
2915-
<< Args.MakeArgString("-ffp-exception-behavior=" + FPExceptionBehavior)
2916-
<< "-fno-trapping-math";
2914+
D.Diag(clang::diag::warn_drv_overriding_option)
2915+
<< Args.MakeArgString("-ffp-exception-behavior=" +
2916+
FPExceptionBehavior)
2917+
<< "-fno-trapping-math";
29172918
TrappingMath = false;
29182919
TrappingMathPresent = true;
29192920
FPExceptionBehavior = "ignore";
@@ -2976,9 +2977,10 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
29762977
if (!TrappingMathPresent && !FPExceptionBehavior.empty() &&
29772978
!FPExceptionBehavior.equals(Val))
29782979
// Warn that previous value of option is overridden.
2979-
D.Diag(clang::diag::warn_drv_overriding_flag_option)
2980-
<< Args.MakeArgString("-ffp-exception-behavior=" + FPExceptionBehavior)
2981-
<< Args.MakeArgString("-ffp-exception-behavior=" + Val);
2980+
D.Diag(clang::diag::warn_drv_overriding_option)
2981+
<< Args.MakeArgString("-ffp-exception-behavior=" +
2982+
FPExceptionBehavior)
2983+
<< Args.MakeArgString("-ffp-exception-behavior=" + Val);
29822984
TrappingMath = TrappingMathPresent = false;
29832985
if (Val.equals("ignore") || Val.equals("maytrap"))
29842986
FPExceptionBehavior = Val;
@@ -3124,7 +3126,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
31243126
? A->getSpelling()
31253127
: Args.MakeArgString(A->getSpelling() + A->getValue());
31263128
if (RHS != "-ffp-model=strict")
3127-
D.Diag(clang::diag::warn_drv_overriding_flag_option)
3129+
D.Diag(clang::diag::warn_drv_overriding_option)
31283130
<< "-ffp-model=strict" << RHS;
31293131
}
31303132
}
@@ -3218,9 +3220,9 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
32183220
// Enable -ffp-contract=fast
32193221
CmdArgs.push_back(Args.MakeArgString("-ffp-contract=fast"));
32203222
else
3221-
D.Diag(clang::diag::warn_drv_overriding_flag_option)
3222-
<< "-ffp-model=fast"
3223-
<< Args.MakeArgString("-ffp-contract=" + FPContract);
3223+
D.Diag(clang::diag::warn_drv_overriding_option)
3224+
<< "-ffp-model=fast"
3225+
<< Args.MakeArgString("-ffp-contract=" + FPContract);
32243226
}
32253227
}
32263228

‎clang/lib/Driver/ToolChains/Darwin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2204,7 +2204,7 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
22042204
std::string OSVersionArg =
22052205
OSVersionArgTarget->getAsString(Args, Opts);
22062206
std::string TargetArg = OSTarget->getAsString(Args, Opts);
2207-
getDriver().Diag(clang::diag::warn_drv_overriding_flag_option)
2207+
getDriver().Diag(clang::diag::warn_drv_overriding_option)
22082208
<< OSVersionArg << TargetArg;
22092209
}
22102210
}

‎clang/test/Driver/fp-model.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,82 +4,82 @@
44

55
// RUN: %clang -### -ffp-model=fast -ffp-contract=off -c %s 2>&1 \
66
// RUN: | FileCheck --check-prefix=WARN %s
7-
// WARN: warning: overriding '-ffp-model=fast' option with '-ffp-contract=off' [-Woverriding-t-option]
7+
// WARN: warning: overriding '-ffp-model=fast' option with '-ffp-contract=off' [-Woverriding-option]
88

99
// RUN: %clang -### -ffp-model=fast -ffp-contract=on -c %s 2>&1 \
1010
// RUN: | FileCheck --check-prefix=WARN1 %s
11-
// WARN1: warning: overriding '-ffp-model=fast' option with '-ffp-contract=on' [-Woverriding-t-option]
11+
// WARN1: warning: overriding '-ffp-model=fast' option with '-ffp-contract=on' [-Woverriding-option]
1212

1313
// RUN: %clang -### -ffp-model=strict -fassociative-math -c %s 2>&1 \
1414
// RUN: | FileCheck --check-prefix=WARN2 %s
15-
// WARN2: warning: overriding '-ffp-model=strict' option with '-fassociative-math' [-Woverriding-t-option]
15+
// WARN2: warning: overriding '-ffp-model=strict' option with '-fassociative-math' [-Woverriding-option]
1616

1717
// RUN: %clang -### -ffp-model=strict -ffast-math -c %s 2>&1 \
1818
// RUN: | FileCheck --check-prefix=WARN3 %s
19-
// WARN3: warning: overriding '-ffp-model=strict' option with '-ffast-math' [-Woverriding-t-option]
19+
// WARN3: warning: overriding '-ffp-model=strict' option with '-ffast-math' [-Woverriding-option]
2020

2121
// RUN: %clang -### -ffp-model=strict -ffinite-math-only -c %s 2>&1 \
2222
// RUN: | FileCheck --check-prefix=WARN4 %s
23-
// WARN4: warning: overriding '-ffp-model=strict' option with '-ffinite-math-only' [-Woverriding-t-option]
23+
// WARN4: warning: overriding '-ffp-model=strict' option with '-ffinite-math-only' [-Woverriding-option]
2424

2525
// RUN: %clang -### -ffp-model=strict -ffp-contract=fast -c %s 2>&1 \
2626
// RUN: | FileCheck --check-prefix=WARN5 %s
27-
// WARN5: warning: overriding '-ffp-model=strict' option with '-ffp-contract=fast' [-Woverriding-t-option]
27+
// WARN5: warning: overriding '-ffp-model=strict' option with '-ffp-contract=fast' [-Woverriding-option]
2828

2929
// RUN: %clang -### -ffp-model=strict -ffp-contract=on -c %s 2>&1 \
3030
// RUN: | FileCheck --check-prefix=WARN7 %s
31-
// WARN7: warning: overriding '-ffp-model=strict' option with '-ffp-contract=on' [-Woverriding-t-option]
31+
// WARN7: warning: overriding '-ffp-model=strict' option with '-ffp-contract=on' [-Woverriding-option]
3232

3333
// RUN: %clang -### -ffp-model=strict -fno-honor-infinities -c %s 2>&1 \
3434
// RUN: | FileCheck --check-prefix=WARN8 %s
35-
// WARN8: warning: overriding '-ffp-model=strict' option with '-fno-honor-infinities' [-Woverriding-t-option]
35+
// WARN8: warning: overriding '-ffp-model=strict' option with '-fno-honor-infinities' [-Woverriding-option]
3636

3737
// RUN: %clang -### -ffp-model=strict -fno-honor-nans -c %s 2>&1 \
3838
// RUN: | FileCheck --check-prefix=WARN9 %s
39-
// WARN9: warning: overriding '-ffp-model=strict' option with '-fno-honor-nans' [-Woverriding-t-option]
39+
// WARN9: warning: overriding '-ffp-model=strict' option with '-fno-honor-nans' [-Woverriding-option]
4040

4141
// RUN: %clang -### -ffp-model=strict -fno-rounding-math -c %s 2>&1 \
4242
// RUN: | FileCheck --check-prefix=WARNa %s
43-
// WARNa: warning: overriding '-ffp-model=strict' option with '-fno-rounding-math' [-Woverriding-t-option]
43+
// WARNa: warning: overriding '-ffp-model=strict' option with '-fno-rounding-math' [-Woverriding-option]
4444

4545
// RUN: %clang -### -ffp-model=strict -fno-signed-zeros -c %s 2>&1 \
4646
// RUN: | FileCheck --check-prefix=WARNb %s
47-
// WARNb: warning: overriding '-ffp-model=strict' option with '-fno-signed-zeros' [-Woverriding-t-option]
47+
// WARNb: warning: overriding '-ffp-model=strict' option with '-fno-signed-zeros' [-Woverriding-option]
4848

4949
// RUN: %clang -### -ffp-model=strict -fno-trapping-math -c %s 2>&1 \
5050
// RUN: | FileCheck --check-prefix=WARNc %s
51-
// WARNc: warning: overriding '-ffp-model=strict' option with '-fno-trapping-math' [-Woverriding-t-option]
51+
// WARNc: warning: overriding '-ffp-model=strict' option with '-fno-trapping-math' [-Woverriding-option]
5252

5353
// RUN: %clang -### -ffp-model=strict -freciprocal-math -c %s 2>&1 \
5454
// RUN: | FileCheck --check-prefix=WARNd %s
55-
// WARNd: warning: overriding '-ffp-model=strict' option with '-freciprocal-math' [-Woverriding-t-option]
55+
// WARNd: warning: overriding '-ffp-model=strict' option with '-freciprocal-math' [-Woverriding-option]
5656

5757
// RUN: %clang -### -ffp-model=strict -funsafe-math-optimizations -c %s 2>&1 \
5858
// RUN: | FileCheck --check-prefix=WARNe %s
59-
// WARNe: warning: overriding '-ffp-model=strict' option with '-funsafe-math-optimizations' [-Woverriding-t-option]
59+
// WARNe: warning: overriding '-ffp-model=strict' option with '-funsafe-math-optimizations' [-Woverriding-option]
6060

6161
// RUN: %clang -### -ffp-model=strict -Ofast -c %s 2>&1 \
6262
// RUN: | FileCheck --check-prefix=WARNf %s
63-
// WARNf: warning: overriding '-ffp-model=strict' option with '-Ofast' [-Woverriding-t-option]
63+
// WARNf: warning: overriding '-ffp-model=strict' option with '-Ofast' [-Woverriding-option]
6464

6565
// RUN: %clang -### -ffp-model=strict -fdenormal-fp-math=preserve-sign,preserve-sign -c %s 2>&1 \
6666
// RUN: | FileCheck --check-prefix=WARN10 %s
67-
// WARN10: warning: overriding '-ffp-model=strict' option with '-fdenormal-fp-math=preserve-sign,preserve-sign' [-Woverriding-t-option]
67+
// WARN10: warning: overriding '-ffp-model=strict' option with '-fdenormal-fp-math=preserve-sign,preserve-sign' [-Woverriding-option]
6868

6969
// RUN: %clang -### -ffp-model=fast -ffp-model=strict -c %s 2>&1 | FileCheck \
7070
// RUN: --check-prefix=WARN11 %s
71-
// WARN11: warning: overriding '-ffp-model=fast' option with '-ffp-model=strict' [-Woverriding-t-option]
72-
// WARN11-NOT: warning: overriding '-ffp-model=strict' option with '-ffp-model=strict' [-Woverriding-t-option]
71+
// WARN11: warning: overriding '-ffp-model=fast' option with '-ffp-model=strict' [-Woverriding-option]
72+
// WARN11-NOT: warning: overriding '-ffp-model=strict' option with '-ffp-model=strict' [-Woverriding-option]
7373

7474
// RUN: %clang -### -Ofast -ffp-model=strict -c %s 2>&1 | FileCheck \
7575
// RUN: --check-prefix=WARN12 %s
7676
// RUN: %clang -### -ffast-math -ffp-model=strict -c %s 2>&1 | FileCheck \
7777
// RUN: --check-prefix=WARN12 %s
78-
// WARN12-NOT: warning: overriding '-ffp-model=strict' option with '-ffp-model=strict' [-Woverriding-t-option]
78+
// WARN12-NOT: warning: overriding '-ffp-model=strict' option with '-ffp-model=strict' [-Woverriding-option]
7979

8080
// RUN: %clang -### -ffp-model=strict -fapprox-func -c %s 2>&1 \
8181
// RUN: | FileCheck --check-prefix=WARN13 %s
82-
// WARN13: warning: overriding '-ffp-model=strict' option with '-fapprox-func' [-Woverriding-t-option]
82+
// WARN13: warning: overriding '-ffp-model=strict' option with '-fapprox-func' [-Woverriding-option]
8383

8484
// RUN: %clang -### -c %s 2>&1 \
8585
// RUN: | FileCheck --check-prefix=CHECK-NOROUND %s

0 commit comments

Comments
 (0)