Skip to content

[llvm] Use std::tie to implement operator< (NFC) #143728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2025
Merged

[llvm] Use std::tie to implement operator< (NFC) #143728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
};

Expand Down
8 changes: 2 additions & 6 deletions llvm/lib/Target/Hexagon/HexagonConstExtenders.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
};

Expand Down
Loading