[llvm] Use std::tie to implement operator< (NFC) #143728
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
std::tie facilitates lexicographical comparisons through std::tuple's built-in operator<.
|
@llvm/pr-subscribers-backend-hexagon Author: Kazu Hirata (kazutakahirata) Changesstd::tie facilitates lexicographical comparisons through std::tuple's Full diff: https://github.com/llvm/llvm-project/pull/143728.diff 2 Files Affected:
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
index 24b03a058981a..89b20978c40e6 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
@@ -202,15 +202,9 @@ class RelocationValueRef {
IsStubThumb == Other.IsStubThumb;
}
inline bool operator<(const RelocationValueRef &Other) const {
- if (SectionID != Other.SectionID)
- return SectionID < Other.SectionID;
- if (Offset != Other.Offset)
- return Offset < Other.Offset;
- if (Addend != Other.Addend)
- return Addend < Other.Addend;
- if (IsStubThumb != Other.IsStubThumb)
- return IsStubThumb < Other.IsStubThumb;
- return SymbolName < Other.SymbolName;
+ return std::tie(SectionID, Offset, Addend, IsStubThumb, SymbolName) <
+ std::tie(Other.SectionID, Other.Offset, Other.Addend,
+ Other.IsStubThumb, Other.SymbolName);
}
};
diff --git a/llvm/lib/Target/Hexagon/HexagonConstExtenders.cpp b/llvm/lib/Target/Hexagon/HexagonConstExtenders.cpp
index f38e7b879e5f0..5dde47ab3de57 100644
--- a/llvm/lib/Target/Hexagon/HexagonConstExtenders.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonConstExtenders.cpp
@@ -253,7 +253,7 @@ namespace {
bool operator!=(Register R) const { return !operator==(R); }
bool operator<(Register R) const {
// For std::map.
- return Reg < R.Reg || (Reg == R.Reg && Sub < R.Sub);
+ return std::tie(Reg, Sub) < std::tie(R.Reg, R.Sub);
}
llvm::Register Reg;
unsigned Sub = 0;
@@ -298,11 +298,7 @@ namespace {
return !operator==(Ex);
}
bool operator<(const ExtExpr &Ex) const {
- if (Rs != Ex.Rs)
- return Rs < Ex.Rs;
- if (S != Ex.S)
- return S < Ex.S;
- return !Neg && Ex.Neg;
+ return std::tie(Rs, S, Neg) < std::tie(Ex.Rs, Ex.S, Ex.Neg);
}
};
|
tgymnich
approved these changes
Jun 11, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/157/builds/30538 Here is the relevant piece of the build log for the reference |
tomtor
pushed a commit
to tomtor/llvm-project
that referenced
this pull request
Jun 14, 2025
std::tie facilitates lexicographical comparisons through std::tuple's built-in operator<.
akuhlens
pushed a commit
to akuhlens/llvm-project
that referenced
this pull request
Jun 24, 2025
std::tie facilitates lexicographical comparisons through std::tuple's built-in operator<.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
std::tie facilitates lexicographical comparisons through std::tuple's
built-in operator<.