[lld] Use std::tie to implement comparison operators (NFC) #143726
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< and operator>.
|
@llvm/pr-subscribers-lld-elf @llvm/pr-subscribers-lld Author: Kazu Hirata (kazutakahirata) Changesstd::tie facilitates lexicographical comparisons through std::tuple's Full diff: https://github.com/llvm/llvm-project/pull/143726.diff 2 Files Affected:
diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp
index 785a56cdb349e..0a9c7a081eb8b 100644
--- a/lld/ELF/SyntheticSections.cpp
+++ b/lld/ELF/SyntheticSections.cpp
@@ -1939,11 +1939,8 @@ bool AndroidPackedRelocationSection<ELFT>::updateAllocSize(Ctx &ctx) {
// For Rela, we also want to sort by r_addend when r_info is the same. This
// enables us to group by r_addend as well.
llvm::sort(nonRelatives, [](const Elf_Rela &a, const Elf_Rela &b) {
- if (a.r_info != b.r_info)
- return a.r_info < b.r_info;
- if (a.r_addend != b.r_addend)
- return a.r_addend < b.r_addend;
- return a.r_offset < b.r_offset;
+ return std::tie(a.r_info, a.r_addend, a.r_offset) <
+ std::tie(b.r_info, b.r_addend, b.r_offset);
});
// Group relocations with the same r_info. Note that each group emits a group
diff --git a/lld/MachO/UnwindInfoSection.cpp b/lld/MachO/UnwindInfoSection.cpp
index 624464e41d77c..6e9f6c2aba749 100644
--- a/lld/MachO/UnwindInfoSection.cpp
+++ b/lld/MachO/UnwindInfoSection.cpp
@@ -535,11 +535,9 @@ void UnwindInfoSectionImpl::finalize() {
llvm::sort(commonEncodings,
[](const std::pair<compact_unwind_encoding_t, size_t> &a,
const std::pair<compact_unwind_encoding_t, size_t> &b) {
- if (a.second == b.second)
- // When frequencies match, secondarily sort on encoding
- // to maintain parity with validate-unwind-info.py
- return a.first > b.first;
- return a.second > b.second;
+ // When frequencies match, secondarily sort on encoding
+ // to maintain parity with validate-unwind-info.py
+ return std::tie(a.second, a.first) > std::tie(b.second, b.first);
});
// Truncate the vector to 127 elements.
|
|
@llvm/pr-subscribers-lld-macho Author: Kazu Hirata (kazutakahirata) Changesstd::tie facilitates lexicographical comparisons through std::tuple's Full diff: https://github.com/llvm/llvm-project/pull/143726.diff 2 Files Affected:
diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp
index 785a56cdb349e..0a9c7a081eb8b 100644
--- a/lld/ELF/SyntheticSections.cpp
+++ b/lld/ELF/SyntheticSections.cpp
@@ -1939,11 +1939,8 @@ bool AndroidPackedRelocationSection<ELFT>::updateAllocSize(Ctx &ctx) {
// For Rela, we also want to sort by r_addend when r_info is the same. This
// enables us to group by r_addend as well.
llvm::sort(nonRelatives, [](const Elf_Rela &a, const Elf_Rela &b) {
- if (a.r_info != b.r_info)
- return a.r_info < b.r_info;
- if (a.r_addend != b.r_addend)
- return a.r_addend < b.r_addend;
- return a.r_offset < b.r_offset;
+ return std::tie(a.r_info, a.r_addend, a.r_offset) <
+ std::tie(b.r_info, b.r_addend, b.r_offset);
});
// Group relocations with the same r_info. Note that each group emits a group
diff --git a/lld/MachO/UnwindInfoSection.cpp b/lld/MachO/UnwindInfoSection.cpp
index 624464e41d77c..6e9f6c2aba749 100644
--- a/lld/MachO/UnwindInfoSection.cpp
+++ b/lld/MachO/UnwindInfoSection.cpp
@@ -535,11 +535,9 @@ void UnwindInfoSectionImpl::finalize() {
llvm::sort(commonEncodings,
[](const std::pair<compact_unwind_encoding_t, size_t> &a,
const std::pair<compact_unwind_encoding_t, size_t> &b) {
- if (a.second == b.second)
- // When frequencies match, secondarily sort on encoding
- // to maintain parity with validate-unwind-info.py
- return a.first > b.first;
- return a.second > b.second;
+ // When frequencies match, secondarily sort on encoding
+ // to maintain parity with validate-unwind-info.py
+ return std::tie(a.second, a.first) > std::tie(b.second, b.first);
});
// Truncate the vector to 127 elements.
|
tgymnich
approved these changes
Jun 11, 2025
MaskRay
approved these changes
Jun 11, 2025
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< and 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< and operator>.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
std::tie facilitates lexicographical comparisons through std::tuple's
built-in operator< and operator>.