diff options
author | Jan Svoboda <jan_svoboda@apple.com> | 2025-07-07 09:01:42 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-07-07 09:01:42 -0700 |
commit | fee168913c752b1048a2fd48b27c698094462d52 (patch) | |
tree | 6fd441fe759b27e76b5cc4cdc501e23b9099c917 /clang/lib/Frontend/CompilerInvocation.cpp | |
parent | 3c76a054ac4c7c93b197f3f1aec6c9f72ece1377 (diff) | |
download | llvm-fee168913c752b1048a2fd48b27c698094462d52.zip llvm-fee168913c752b1048a2fd48b27c698094462d52.tar.gz llvm-fee168913c752b1048a2fd48b27c698094462d52.tar.bz2 |
[clang] Refactor `LangOptions` to specify compatibility as X macro arg (#146766)
This removes the `{BENIGN,COMPATIBLE}{,_ENUM,_VALUE}_LANGOPT` X macros
controlling `LangOptions`. These are permutations of the base `LANGOPT`,
`ENUM_LANGOPT` and `VALUE_LANGOPT` X macros that also carry the
information of their effect on AST (and therefore module compatibility).
Their functionality is now implemented by passing `Benign`, `Compatible`
or `NotCompatible` argument to the base X macros and using C++17 `if
constexpr` in the clients to achieve the same codegen.
This PR solves this FIXME:
```
// FIXME: Clients should be able to more easily select whether they want
// different levels of compatibility versus how to handle different kinds
// of option.
```
The base X macros are preserved, since they are used in `LangOptions.h`
to generate different kinds of field and function declarations for
flags, values and enums, which can't be achieved with `if constexpr`.
The new syntax also forces developers to think about compatibility when
adding new language option, hopefully reducing the number of new options
that are affecting by default even though they are benign or compatible.
Note that the `BENIGN_` macros used to forward to their `COMPATIBLE_`
counterparts. I don't think this ever kicked in, since there are no
clients of the `.def` file that define `COMPATIBLE_` without also
defining `BENIGN_`. However, this might be something downstream forks
need to take care of by doing `if constexpr (CK::Compatibility ==
CK::Benign || CK::Compatibility == CK::Compatible)` in place of `#define
COMPATIBLE_`.
Diffstat (limited to 'clang/lib/Frontend/CompilerInvocation.cpp')
-rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 6633e4a..e233821 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -5222,11 +5222,14 @@ std::string CompilerInvocation::getModuleHash() const { HBuilder.add(serialization::VERSION_MAJOR, serialization::VERSION_MINOR); // Extend the signature with the language options -#define LANGOPT(Name, Bits, Default, Description) HBuilder.add(LangOpts->Name); -#define ENUM_LANGOPT(Name, Type, Bits, Default, Description) \ - HBuilder.add(static_cast<unsigned>(LangOpts->get##Name())); -#define BENIGN_LANGOPT(Name, Bits, Default, Description) -#define BENIGN_ENUM_LANGOPT(Name, Type, Bits, Default, Description) + // FIXME: Replace with C++20 `using enum LangOptions::CompatibilityKind`. + using CK = LangOptions::CompatibilityKind; +#define LANGOPT(Name, Bits, Default, Compatibility, Description) \ + if constexpr (CK::Compatibility != CK::Benign) \ + HBuilder.add(LangOpts->Name); +#define ENUM_LANGOPT(Name, Type, Bits, Default, Compatibility, Description) \ + if constexpr (CK::Compatibility != CK::Benign) \ + HBuilder.add(static_cast<unsigned>(LangOpts->get##Name())); #include "clang/Basic/LangOptions.def" HBuilder.addRange(getLangOpts().ModuleFeatures); |