From: Nico Weber <thakis@chromium.org>
Date: Fri, 23 Jul 2021 20:54:19 +0000 (-0400)
Subject: [lld/mac] Fix start-stop.s test with expensive checks enabled
X-Git-Tag: llvmorg-14-init~422
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04f5eb407c74d433589739a719c3fc75a08859b3;p=platform%2Fupstream%2Fllvm.git

[lld/mac] Fix start-stop.s test with expensive checks enabled

See e.g. https://lab.llvm.org/buildbot/#/builders/16/builds/14317
Not 100% sure why this fails yet, but this fixes it. Let's get
the bots green again first :)

Differential Revision: https://reviews.llvm.org/D106711
---

diff --git a/lld/MachO/OutputSegment.cpp b/lld/MachO/OutputSegment.cpp
index 8a050c4..7345bf0 100644
--- a/lld/MachO/OutputSegment.cpp
+++ b/lld/MachO/OutputSegment.cpp
@@ -146,10 +146,8 @@ void OutputSegment::sortOutputSections() {
 }
 
 void macho::sortOutputSegments() {
-  // sort() instead of stable_sort() is fine because segmentOrder() is
-  // name-based and getOrCreateOutputSegment() makes there's only a single
-  // segment for every name.
-  llvm::sort(outputSegments, compareByOrder<OutputSegment *>(segmentOrder));
+  llvm::stable_sort(outputSegments,
+                    compareByOrder<OutputSegment *>(segmentOrder));
 }
 
 static DenseMap<StringRef, OutputSegment *> nameToOutputSegment;