Skip to content

Commit f4c3254

Browse files
authored
[clang][NFC] rename FPOptions.def's macro to FP_OPTION (#138374)
While investigating the recent warnings around FEM_Indeterminate I noticed that the macro name for FPOptions.def was given the very generic name `OPTION`. This PR renames it to FP_OPTION instead.
1 parent 51e157f commit f4c3254

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

clang/include/clang/Basic/FPOptions.def

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
//===----------------------------------------------------------------------===//
88

99
// This file defines the Floating Point language options. Users of this file
10-
// must define the OPTION macro to make use of this information.
11-
#ifndef OPTION
12-
# error Define the OPTION macro to handle floating point language options
10+
// must define the FP_OPTION macro to make use of this information.
11+
#ifndef FP_OPTION
12+
# error Define the FP_OPTION macro to handle floating point language options
1313
#endif
1414

15-
// OPTION(name, type, width, previousName)
16-
OPTION(FPContractMode, LangOptions::FPModeKind, 2, First)
17-
OPTION(RoundingMath, bool, 1, FPContractMode)
18-
OPTION(ConstRoundingMode, LangOptions::RoundingMode, 3, RoundingMath)
19-
OPTION(SpecifiedExceptionMode, LangOptions::FPExceptionModeKind, 2, ConstRoundingMode)
20-
OPTION(AllowFEnvAccess, bool, 1, SpecifiedExceptionMode)
21-
OPTION(AllowFPReassociate, bool, 1, AllowFEnvAccess)
22-
OPTION(NoHonorNaNs, bool, 1, AllowFPReassociate)
23-
OPTION(NoHonorInfs, bool, 1, NoHonorNaNs)
24-
OPTION(NoSignedZero, bool, 1, NoHonorInfs)
25-
OPTION(AllowReciprocal, bool, 1, NoSignedZero)
26-
OPTION(AllowApproxFunc, bool, 1, AllowReciprocal)
27-
OPTION(FPEvalMethod, LangOptions::FPEvalMethodKind, 2, AllowApproxFunc)
28-
OPTION(Float16ExcessPrecision, LangOptions::ExcessPrecisionKind, 2, FPEvalMethod)
29-
OPTION(BFloat16ExcessPrecision, LangOptions::ExcessPrecisionKind, 2, Float16ExcessPrecision)
30-
OPTION(MathErrno, bool, 1, BFloat16ExcessPrecision)
31-
OPTION(ComplexRange, LangOptions::ComplexRangeKind, 3, MathErrno)
32-
#undef OPTION
15+
// FP_OPTION(name, type, width, previousName)
16+
FP_OPTION(FPContractMode, LangOptions::FPModeKind, 2, First)
17+
FP_OPTION(RoundingMath, bool, 1, FPContractMode)
18+
FP_OPTION(ConstRoundingMode, LangOptions::RoundingMode, 3, RoundingMath)
19+
FP_OPTION(SpecifiedExceptionMode, LangOptions::FPExceptionModeKind, 2, ConstRoundingMode)
20+
FP_OPTION(AllowFEnvAccess, bool, 1, SpecifiedExceptionMode)
21+
FP_OPTION(AllowFPReassociate, bool, 1, AllowFEnvAccess)
22+
FP_OPTION(NoHonorNaNs, bool, 1, AllowFPReassociate)
23+
FP_OPTION(NoHonorInfs, bool, 1, NoHonorNaNs)
24+
FP_OPTION(NoSignedZero, bool, 1, NoHonorInfs)
25+
FP_OPTION(AllowReciprocal, bool, 1, NoSignedZero)
26+
FP_OPTION(AllowApproxFunc, bool, 1, AllowReciprocal)
27+
FP_OPTION(FPEvalMethod, LangOptions::FPEvalMethodKind, 2, AllowApproxFunc)
28+
FP_OPTION(Float16ExcessPrecision, LangOptions::ExcessPrecisionKind, 2, FPEvalMethod)
29+
FP_OPTION(BFloat16ExcessPrecision, LangOptions::ExcessPrecisionKind, 2, Float16ExcessPrecision)
30+
FP_OPTION(MathErrno, bool, 1, BFloat16ExcessPrecision)
31+
FP_OPTION(ComplexRange, LangOptions::ComplexRangeKind, 3, MathErrno)
32+
#undef FP_OPTION

clang/include/clang/Basic/LangOptions.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ class FPOptions {
856856
// Define a fake option named "First" so that we have a PREVIOUS even for the
857857
// real first option.
858858
static constexpr storage_type FirstShift = 0, FirstWidth = 0;
859-
#define OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
859+
#define FP_OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
860860
static constexpr storage_type NAME##Shift = \
861861
PREVIOUS##Shift + PREVIOUS##Width; \
862862
static constexpr storage_type NAME##Width = WIDTH; \
@@ -865,7 +865,7 @@ class FPOptions {
865865
#include "clang/Basic/FPOptions.def"
866866

867867
static constexpr storage_type TotalWidth = 0
868-
#define OPTION(NAME, TYPE, WIDTH, PREVIOUS) +WIDTH
868+
#define FP_OPTION(NAME, TYPE, WIDTH, PREVIOUS) +WIDTH
869869
#include "clang/Basic/FPOptions.def"
870870
;
871871
static_assert(TotalWidth <= StorageBitSize, "Too short type for FPOptions");
@@ -974,7 +974,7 @@ class FPOptions {
974974
// We can define most of the accessors automatically:
975975
// TODO: consider enforcing the assertion that value fits within bits
976976
// statically.
977-
#define OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
977+
#define FP_OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
978978
TYPE get##NAME() const { \
979979
return static_cast<TYPE>((Value & NAME##Mask) >> NAME##Shift); \
980980
} \
@@ -1085,7 +1085,7 @@ class FPOptionsOverride {
10851085
}
10861086
bool operator!=(FPOptionsOverride other) const { return !(*this == other); }
10871087

1088-
#define OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
1088+
#define FP_OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
10891089
bool has##NAME##Override() const { \
10901090
return OverrideMask & FPOptions::NAME##Mask; \
10911091
} \

clang/lib/AST/JSONNodeDumper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1864,7 +1864,7 @@ void JSONNodeDumper::visitVerbatimLineComment(
18641864

18651865
llvm::json::Object JSONNodeDumper::createFPOptions(FPOptionsOverride FPO) {
18661866
llvm::json::Object Ret;
1867-
#define OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
1867+
#define FP_OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
18681868
if (FPO.has##NAME##Override()) \
18691869
Ret.try_emplace(#NAME, static_cast<unsigned>(FPO.get##NAME##Override()));
18701870
#include "clang/Basic/FPOptions.def"

clang/lib/AST/TextNodeDumper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ const char *TextNodeDumper::getCommandName(unsigned CommandID) {
11141114
}
11151115

11161116
void TextNodeDumper::printFPOptions(FPOptionsOverride FPO) {
1117-
#define OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
1117+
#define FP_OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
11181118
if (FPO.has##NAME##Override()) \
11191119
OS << " " #NAME "=" << FPO.get##NAME##Override();
11201120
#include "clang/Basic/FPOptions.def"

clang/lib/Basic/LangOptions.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,22 +219,22 @@ FPOptions FPOptions::defaultWithoutTrailingStorage(const LangOptions &LO) {
219219

220220
FPOptionsOverride FPOptions::getChangesSlow(const FPOptions &Base) const {
221221
FPOptions::storage_type OverrideMask = 0;
222-
#define OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
222+
#define FP_OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
223223
if (get##NAME() != Base.get##NAME()) \
224224
OverrideMask |= NAME##Mask;
225225
#include "clang/Basic/FPOptions.def"
226226
return FPOptionsOverride(*this, OverrideMask);
227227
}
228228

229229
LLVM_DUMP_METHOD void FPOptions::dump() {
230-
#define OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
230+
#define FP_OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
231231
llvm::errs() << "\n " #NAME " " << get##NAME();
232232
#include "clang/Basic/FPOptions.def"
233233
llvm::errs() << "\n";
234234
}
235235

236236
LLVM_DUMP_METHOD void FPOptionsOverride::dump() {
237-
#define OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
237+
#define FP_OPTION(NAME, TYPE, WIDTH, PREVIOUS) \
238238
if (has##NAME##Override()) \
239239
llvm::errs() << "\n " #NAME " Override is " << get##NAME##Override();
240240
#include "clang/Basic/FPOptions.def"

0 commit comments

Comments
 (0)