File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -289,8 +289,8 @@ struct LineLocation {
289289 LLVM_ABI void serialize (raw_ostream &OS);
290290
291291 bool operator <(const LineLocation &O) const {
292- return LineOffset < O. LineOffset ||
293- (LineOffset == O.LineOffset && Discriminator < O.Discriminator );
292+ return std::tie ( LineOffset, Discriminator) <
293+ std::tie ( O.LineOffset , O.Discriminator );
294294 }
295295
296296 bool operator ==(const LineLocation &O) const {
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ struct HexagonBlockRanges {
3737 unsigned Sub;
3838
3939 bool operator <(RegisterRef R) const {
40- return Reg < R. Reg || (Reg == R.Reg && Sub < R.Sub );
40+ return std::tie ( Reg, Sub) < std::tie ( R.Reg , R.Sub );
4141 }
4242 };
4343 using RegisterSet = std::set<RegisterRef>;
Original file line number Diff line number Diff line change @@ -80,12 +80,12 @@ struct MIRef {
8080 bool operator <(const MIRef &RHS) const {
8181 // Comparison between different BBs happens when inserting a MIRef into set.
8282 // So we compare MBB first to make the insertion happy.
83- return MBB < RHS. MBB || (MBB == RHS.MBB && Pos < RHS.Pos );
83+ return std::tie ( MBB, Pos) < std::tie ( RHS.MBB , RHS.Pos );
8484 }
8585 bool operator >(const MIRef &RHS) const {
8686 // Comparison between different BBs happens when inserting a MIRef into set.
8787 // So we compare MBB first to make the insertion happy.
88- return MBB > RHS. MBB || (MBB == RHS.MBB && Pos > RHS.Pos );
88+ return std::tie ( MBB, Pos) > std::tie ( RHS.MBB , RHS.Pos );
8989 }
9090};
9191
You can’t perform that action at this time.
0 commit comments