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

Nico Weber via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Fri Jul 23 13:56:27 PDT 2021


thakis created this revision.
thakis added a reviewer: lld-macho.
Herald added a subscriber: mgrang.
Herald added a reviewer: gkm.
Herald added a project: lld-macho.
thakis requested review of this revision.

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 :)


https://reviews.llvm.org/D106711

Files:
  lld/MachO/OutputSegment.cpp


Index: lld/MachO/OutputSegment.cpp
===================================================================
--- lld/MachO/OutputSegment.cpp
+++ lld/MachO/OutputSegment.cpp
@@ -146,10 +146,8 @@
 }
 
 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;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D106711.361341.patch
Type: text/x-patch
Size: 662 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210723/ef101ca3/attachment.bin>


More information about the llvm-commits mailing list