Guarantee strict weak order in Probe::finalize_locations

diff --git a/src/cc/usdt/usdt.cc b/src/cc/usdt/usdt.cc
index 0c6213fe5d5180fc8cce9e84eb2a5029d87126a2..bd3f26517127d056b75898ec150f629b1e05e7f9 100644 (file)
--- a/src/cc/usdt/usdt.cc
+++ b/src/cc/usdt/usdt.cc
@@ -222,7 +222,7 @@ void Probe::add_location(uint64_t addr, const std::string &bin_path, const char
 void Probe::finalize_locations() {
   std::sort(locations_.begin(), locations_.end(),
             [](const Location &a, const Location &b) {
-              return a.bin_path_ < b.bin_path_ || a.address_ < b.address_;
+              return std::tie(a.bin_path_, a.address_) < std::tie(b.bin_path_, b.address_);
             });
   auto last = std::unique(locations_.begin(), locations_.end(),
                           [](const Location &a, const Location &b) {