[clang] [llvm] [Basic][NFC] Replace keyword StringSwitch with linear search (PR #236071)
Alexis Engelke via cfe-commits
cfe-commits at lists.llvm.org
Tue Oct 27 06:09:01 PDT 2026
https://github.com/aengelke updated https://github.com/llvm/llvm-project/pull/236071
>From c3604df11ed37b36a9b27e2dca57016230e6774b Mon Sep 17 00:00:00 2001
From: Alexis Engelke <engelke at in.tum.de>
Date: Tue, 27 Oct 2026 11:18:27 +0000
Subject: [PATCH 1/2] [spr] initial version
Created using spr 2.0.0-beta.2
---
clang/lib/Basic/IdentifierTable.cpp | 10 +++++++---
llvm/include/llvm/ADT/Enum.h | 8 ++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index 55cd0f7677517c..35862ff0e2c689 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -20,6 +20,7 @@
#include "clang/Basic/TargetBuiltins.h"
#include "clang/Basic/TokenKinds.h"
#include "llvm/ADT/DenseMapInfo.h"
+#include "llvm/ADT/Enum.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringRef.h"
@@ -828,11 +829,14 @@ IdentifierTable::getFutureCompatDiagKind(const IdentifierInfo &II,
const LangOptions &LangOpts) {
assert(II.isFutureCompatKeyword() && "diagnostic should not be needed");
- unsigned Flags = llvm::StringSwitch<unsigned>(II.getName())
-#define KEYWORD(NAME, FLAGS) .Case(#NAME, FLAGS)
+ constexpr llvm::EnumStringDef<uint32_t> FlagsDefs[] = {
+#define KEYWORD(NAME, FLAGS) {{#NAME}, FLAGS},
#include "clang/Basic/TokenKinds.def"
#undef KEYWORD
- ;
+ };
+ static constexpr auto FlagsData = BUILD_ENUM_STRINGS(FlagsDefs);
+ unsigned Flags =
+ llvm::EnumStrings(FlagsData).fromString(II.getName())->value();
if (LangOpts.CPlusPlus) {
if ((Flags & KEYCXX11) == KEYCXX11)
diff --git a/llvm/include/llvm/ADT/Enum.h b/llvm/include/llvm/ADT/Enum.h
index b4a6d1f8e7069e..4387d75ae268f4 100644
--- a/llvm/include/llvm/ADT/Enum.h
+++ b/llvm/include/llvm/ADT/Enum.h
@@ -147,6 +147,14 @@ template <typename T, unsigned NumStrs = 1> class EnumStrings {
return utohexstr(Value, true);
}
+ /// Return first entry whose name matches Str, or null.
+ const EnumString *fromString(StringRef Str, unsigned StrIdx = 0) const {
+ for (const auto &EnumItem : EnumValues)
+ if (EnumItem.name(StrIdx) == Str)
+ return &EnumItem;
+ return nullptr;
+ }
+
size_t size() const { return EnumValues.size(); }
const EnumString &operator[](size_t Idx) const { return EnumValues[Idx]; }
const EnumString *begin() const { return EnumValues.begin(); }
>From 0dfa3a865f64def1bf16c323614d80ac91bd10fd Mon Sep 17 00:00:00 2001
From: Alexis Engelke <engelke at in.tum.de>
Date: Tue, 27 Oct 2026 13:08:46 +0000
Subject: [PATCH 2/2] feedback
Created using spr 2.0.0-beta.2
---
clang/lib/Basic/IdentifierTable.cpp | 5 +++--
llvm/include/llvm/ADT/Enum.h | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index 35862ff0e2c689..aadf224211508c 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -835,8 +835,9 @@ IdentifierTable::getFutureCompatDiagKind(const IdentifierInfo &II,
#undef KEYWORD
};
static constexpr auto FlagsData = BUILD_ENUM_STRINGS(FlagsDefs);
- unsigned Flags =
- llvm::EnumStrings(FlagsData).fromString(II.getName())->value();
+ const auto *Entry = llvm::EnumStrings(FlagsData).fromString(II.getName());
+ assert(Entry && "future compat keyword should be in keyword list");
+ uint32_t Flags = Entry->value();
if (LangOpts.CPlusPlus) {
if ((Flags & KEYCXX11) == KEYCXX11)
diff --git a/llvm/include/llvm/ADT/Enum.h b/llvm/include/llvm/ADT/Enum.h
index 4387d75ae268f4..548d5c99259b14 100644
--- a/llvm/include/llvm/ADT/Enum.h
+++ b/llvm/include/llvm/ADT/Enum.h
@@ -149,6 +149,9 @@ template <typename T, unsigned NumStrs = 1> class EnumStrings {
/// Return first entry whose name matches Str, or null.
const EnumString *fromString(StringRef Str, unsigned StrIdx = 0) const {
+ // TODO: optimize with binary search when entries are sorted by name. Also
+ // decide whether to start sorting entries by name or by value as we usually
+ // can't do both at the same time.
for (const auto &EnumItem : EnumValues)
if (EnumItem.name(StrIdx) == Str)
return &EnumItem;
More information about the cfe-commits
mailing list