[clang-tidy][NFC] Construct map at compile time #158166
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-clang-tools-extra Author: Victor Chernyakin (localspook) ChangesThe important part of this PR is the changes to Full diff: https://github.com/llvm/llvm-project/pull/158166.diff 1 Files Affected:
diff --git a/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp b/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp
index 4cdbbd43c1431..1dab94558d0f7 100644
--- a/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp
@@ -6,24 +6,17 @@
//
//===----------------------------------------------------------------------===//
+#include <array>
#include <cmath>
#include <optional>
#include "DurationRewriter.h"
#include "clang/Tooling/FixIt.h"
-#include "llvm/ADT/IndexedMap.h"
using namespace clang::ast_matchers;
namespace clang::tidy::abseil {
-struct DurationScale2IndexFunctor {
- using argument_type = DurationScale;
- unsigned operator()(DurationScale Scale) const {
- return static_cast<unsigned>(Scale);
- }
-};
-
/// Returns an integer if the fractional part of a `FloatingLiteral` is `0`.
static std::optional<llvm::APSInt>
truncateIfIntegral(const FloatingLiteral &FloatLiteral) {
@@ -39,31 +32,17 @@ truncateIfIntegral(const FloatingLiteral &FloatLiteral) {
const std::pair<llvm::StringRef, llvm::StringRef> &
getDurationInverseForScale(DurationScale Scale) {
- static const llvm::IndexedMap<std::pair<llvm::StringRef, llvm::StringRef>,
- DurationScale2IndexFunctor>
- InverseMap = []() {
- // TODO: Revisit the immediately invoked lambda technique when
- // IndexedMap gets an initializer list constructor.
- llvm::IndexedMap<std::pair<llvm::StringRef, llvm::StringRef>,
- DurationScale2IndexFunctor>
- InverseMap;
- InverseMap.resize(6);
- InverseMap[DurationScale::Hours] =
- std::make_pair("::absl::ToDoubleHours", "::absl::ToInt64Hours");
- InverseMap[DurationScale::Minutes] =
- std::make_pair("::absl::ToDoubleMinutes", "::absl::ToInt64Minutes");
- InverseMap[DurationScale::Seconds] =
- std::make_pair("::absl::ToDoubleSeconds", "::absl::ToInt64Seconds");
- InverseMap[DurationScale::Milliseconds] = std::make_pair(
- "::absl::ToDoubleMilliseconds", "::absl::ToInt64Milliseconds");
- InverseMap[DurationScale::Microseconds] = std::make_pair(
- "::absl::ToDoubleMicroseconds", "::absl::ToInt64Microseconds");
- InverseMap[DurationScale::Nanoseconds] = std::make_pair(
- "::absl::ToDoubleNanoseconds", "::absl::ToInt64Nanoseconds");
- return InverseMap;
- }();
-
- return InverseMap[Scale];
+ static constexpr std::array<std::pair<llvm::StringRef, llvm::StringRef>, 6>
+ InverseMap = {{
+ {"::absl::ToDoubleHours", "::absl::ToInt64Hours"},
+ {"::absl::ToDoubleMinutes", "::absl::ToInt64Minutes"},
+ {"::absl::ToDoubleSeconds", "::absl::ToInt64Seconds"},
+ {"::absl::ToDoubleMilliseconds", "::absl::ToInt64Milliseconds"},
+ {"::absl::ToDoubleMicroseconds", "::absl::ToInt64Microseconds"},
+ {"::absl::ToDoubleNanoseconds", "::absl::ToInt64Nanoseconds"},
+ }};
+
+ return InverseMap[llvm::to_underlying(Scale)];
}
/// If `Node` is a call to the inverse of `Scale`, return that inverse's
@@ -103,58 +82,31 @@ rewriteInverseTimeCall(const MatchFinder::MatchResult &Result,
/// Returns the factory function name for a given `Scale`.
llvm::StringRef getDurationFactoryForScale(DurationScale Scale) {
- switch (Scale) {
- case DurationScale::Hours:
- return "absl::Hours";
- case DurationScale::Minutes:
- return "absl::Minutes";
- case DurationScale::Seconds:
- return "absl::Seconds";
- case DurationScale::Milliseconds:
- return "absl::Milliseconds";
- case DurationScale::Microseconds:
- return "absl::Microseconds";
- case DurationScale::Nanoseconds:
- return "absl::Nanoseconds";
- }
- llvm_unreachable("unknown scaling factor");
+ static constexpr std::array<llvm::StringRef, 6> FactoryMap = {
+ "absl::Hours", "absl::Minutes", "absl::Seconds",
+ "absl::Milliseconds", "absl::Microseconds", "absl::Nanoseconds",
+ };
+
+ return FactoryMap[llvm::to_underlying(Scale)];
}
llvm::StringRef getTimeFactoryForScale(DurationScale Scale) {
- switch (Scale) {
- case DurationScale::Hours:
- return "absl::FromUnixHours";
- case DurationScale::Minutes:
- return "absl::FromUnixMinutes";
- case DurationScale::Seconds:
- return "absl::FromUnixSeconds";
- case DurationScale::Milliseconds:
- return "absl::FromUnixMillis";
- case DurationScale::Microseconds:
- return "absl::FromUnixMicros";
- case DurationScale::Nanoseconds:
- return "absl::FromUnixNanos";
- }
- llvm_unreachable("unknown scaling factor");
+ static constexpr std::array<llvm::StringRef, 6> FactoryMap = {
+ "absl::FromUnixHours", "absl::FromUnixMinutes", "absl::FromUnixSeconds",
+ "absl::FromUnixMillis", "absl::FromUnixMicros", "absl::FromUnixNanos",
+ };
+
+ return FactoryMap[llvm::to_underlying(Scale)];
}
/// Returns the Time factory function name for a given `Scale`.
llvm::StringRef getTimeInverseForScale(DurationScale Scale) {
- switch (Scale) {
- case DurationScale::Hours:
- return "absl::ToUnixHours";
- case DurationScale::Minutes:
- return "absl::ToUnixMinutes";
- case DurationScale::Seconds:
- return "absl::ToUnixSeconds";
- case DurationScale::Milliseconds:
- return "absl::ToUnixMillis";
- case DurationScale::Microseconds:
- return "absl::ToUnixMicros";
- case DurationScale::Nanoseconds:
- return "absl::ToUnixNanos";
- }
- llvm_unreachable("unknown scaling factor");
+ static constexpr std::array<llvm::StringRef, 6> InverseMap = {
+ "absl::ToUnixHours", "absl::ToUnixMinutes", "absl::ToUnixSeconds",
+ "absl::ToUnixMillis", "absl::ToUnixMicros", "absl::ToUnixNanos",
+ };
+
+ return InverseMap[llvm::to_underlying(Scale)];
}
/// Returns `true` if `Node` is a value which evaluates to a literal `0`.
|
|
@llvm/pr-subscribers-clang-tidy Author: Victor Chernyakin (localspook) ChangesThe important part of this PR is the changes to Full diff: https://github.com/llvm/llvm-project/pull/158166.diff 1 Files Affected:
diff --git a/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp b/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp
index 4cdbbd43c1431..1dab94558d0f7 100644
--- a/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp
+++ b/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp
@@ -6,24 +6,17 @@
//
//===----------------------------------------------------------------------===//
+#include <array>
#include <cmath>
#include <optional>
#include "DurationRewriter.h"
#include "clang/Tooling/FixIt.h"
-#include "llvm/ADT/IndexedMap.h"
using namespace clang::ast_matchers;
namespace clang::tidy::abseil {
-struct DurationScale2IndexFunctor {
- using argument_type = DurationScale;
- unsigned operator()(DurationScale Scale) const {
- return static_cast<unsigned>(Scale);
- }
-};
-
/// Returns an integer if the fractional part of a `FloatingLiteral` is `0`.
static std::optional<llvm::APSInt>
truncateIfIntegral(const FloatingLiteral &FloatLiteral) {
@@ -39,31 +32,17 @@ truncateIfIntegral(const FloatingLiteral &FloatLiteral) {
const std::pair<llvm::StringRef, llvm::StringRef> &
getDurationInverseForScale(DurationScale Scale) {
- static const llvm::IndexedMap<std::pair<llvm::StringRef, llvm::StringRef>,
- DurationScale2IndexFunctor>
- InverseMap = []() {
- // TODO: Revisit the immediately invoked lambda technique when
- // IndexedMap gets an initializer list constructor.
- llvm::IndexedMap<std::pair<llvm::StringRef, llvm::StringRef>,
- DurationScale2IndexFunctor>
- InverseMap;
- InverseMap.resize(6);
- InverseMap[DurationScale::Hours] =
- std::make_pair("::absl::ToDoubleHours", "::absl::ToInt64Hours");
- InverseMap[DurationScale::Minutes] =
- std::make_pair("::absl::ToDoubleMinutes", "::absl::ToInt64Minutes");
- InverseMap[DurationScale::Seconds] =
- std::make_pair("::absl::ToDoubleSeconds", "::absl::ToInt64Seconds");
- InverseMap[DurationScale::Milliseconds] = std::make_pair(
- "::absl::ToDoubleMilliseconds", "::absl::ToInt64Milliseconds");
- InverseMap[DurationScale::Microseconds] = std::make_pair(
- "::absl::ToDoubleMicroseconds", "::absl::ToInt64Microseconds");
- InverseMap[DurationScale::Nanoseconds] = std::make_pair(
- "::absl::ToDoubleNanoseconds", "::absl::ToInt64Nanoseconds");
- return InverseMap;
- }();
-
- return InverseMap[Scale];
+ static constexpr std::array<std::pair<llvm::StringRef, llvm::StringRef>, 6>
+ InverseMap = {{
+ {"::absl::ToDoubleHours", "::absl::ToInt64Hours"},
+ {"::absl::ToDoubleMinutes", "::absl::ToInt64Minutes"},
+ {"::absl::ToDoubleSeconds", "::absl::ToInt64Seconds"},
+ {"::absl::ToDoubleMilliseconds", "::absl::ToInt64Milliseconds"},
+ {"::absl::ToDoubleMicroseconds", "::absl::ToInt64Microseconds"},
+ {"::absl::ToDoubleNanoseconds", "::absl::ToInt64Nanoseconds"},
+ }};
+
+ return InverseMap[llvm::to_underlying(Scale)];
}
/// If `Node` is a call to the inverse of `Scale`, return that inverse's
@@ -103,58 +82,31 @@ rewriteInverseTimeCall(const MatchFinder::MatchResult &Result,
/// Returns the factory function name for a given `Scale`.
llvm::StringRef getDurationFactoryForScale(DurationScale Scale) {
- switch (Scale) {
- case DurationScale::Hours:
- return "absl::Hours";
- case DurationScale::Minutes:
- return "absl::Minutes";
- case DurationScale::Seconds:
- return "absl::Seconds";
- case DurationScale::Milliseconds:
- return "absl::Milliseconds";
- case DurationScale::Microseconds:
- return "absl::Microseconds";
- case DurationScale::Nanoseconds:
- return "absl::Nanoseconds";
- }
- llvm_unreachable("unknown scaling factor");
+ static constexpr std::array<llvm::StringRef, 6> FactoryMap = {
+ "absl::Hours", "absl::Minutes", "absl::Seconds",
+ "absl::Milliseconds", "absl::Microseconds", "absl::Nanoseconds",
+ };
+
+ return FactoryMap[llvm::to_underlying(Scale)];
}
llvm::StringRef getTimeFactoryForScale(DurationScale Scale) {
- switch (Scale) {
- case DurationScale::Hours:
- return "absl::FromUnixHours";
- case DurationScale::Minutes:
- return "absl::FromUnixMinutes";
- case DurationScale::Seconds:
- return "absl::FromUnixSeconds";
- case DurationScale::Milliseconds:
- return "absl::FromUnixMillis";
- case DurationScale::Microseconds:
- return "absl::FromUnixMicros";
- case DurationScale::Nanoseconds:
- return "absl::FromUnixNanos";
- }
- llvm_unreachable("unknown scaling factor");
+ static constexpr std::array<llvm::StringRef, 6> FactoryMap = {
+ "absl::FromUnixHours", "absl::FromUnixMinutes", "absl::FromUnixSeconds",
+ "absl::FromUnixMillis", "absl::FromUnixMicros", "absl::FromUnixNanos",
+ };
+
+ return FactoryMap[llvm::to_underlying(Scale)];
}
/// Returns the Time factory function name for a given `Scale`.
llvm::StringRef getTimeInverseForScale(DurationScale Scale) {
- switch (Scale) {
- case DurationScale::Hours:
- return "absl::ToUnixHours";
- case DurationScale::Minutes:
- return "absl::ToUnixMinutes";
- case DurationScale::Seconds:
- return "absl::ToUnixSeconds";
- case DurationScale::Milliseconds:
- return "absl::ToUnixMillis";
- case DurationScale::Microseconds:
- return "absl::ToUnixMicros";
- case DurationScale::Nanoseconds:
- return "absl::ToUnixNanos";
- }
- llvm_unreachable("unknown scaling factor");
+ static constexpr std::array<llvm::StringRef, 6> InverseMap = {
+ "absl::ToUnixHours", "absl::ToUnixMinutes", "absl::ToUnixSeconds",
+ "absl::ToUnixMillis", "absl::ToUnixMicros", "absl::ToUnixNanos",
+ };
+
+ return InverseMap[llvm::to_underlying(Scale)];
}
/// Returns `true` if `Node` is a value which evaluates to a literal `0`.
|
localspook
requested review from
5chmidti,
EugeneZelenko,
HerrCai0907,
PiotrZSL,
carlosgalvezp and
vbvictor
nicovank
approved these changes
Sep 12, 2025
vbvictor
reviewed
Sep 12, 2025
vbvictor
approved these changes
Sep 12, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/190/builds/27702 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The important part of this PR is the changes to
getDurationInverseForScale. I changed the otherget*ForScalefunctions so that they all follow the same pattern, but those aren't as important.