[lld] 1bc33eb - [lld-macho][nfc] minor clean up, follow up to D98559

Vy Nguyen via llvm-commits llvm-commits at lists.llvm.org
Tue Mar 23 13:13:27 PDT 2021


Author: Vy Nguyen
Date: 2021-03-23T16:13:09-04:00
New Revision: 1bc33eb6a32bdb193a8b838df823b4563450f6b3

URL: https://github.com/llvm/llvm-project/commit/1bc33eb6a32bdb193a8b838df823b4563450f6b3
DIFF: https://github.com/llvm/llvm-project/commit/1bc33eb6a32bdb193a8b838df823b4563450f6b3.diff

LOG: [lld-macho][nfc] minor clean up, follow up to D98559

Differential Revision: https://reviews.llvm.org/D99210

Added: 
    

Modified: 
    lld/MachO/DriverUtils.cpp
    lld/test/MachO/dependency-info.s

Removed: 
    


################################################################################
diff  --git a/lld/MachO/DriverUtils.cpp b/lld/MachO/DriverUtils.cpp
index a12e1c537c16..49bd83ecf09a 100644
--- a/lld/MachO/DriverUtils.cpp
+++ b/lld/MachO/DriverUtils.cpp
@@ -284,8 +284,8 @@ void macho::DependencyTracker::write(llvm::StringRef version,
   inputNames.reserve(inputs.size());
   for (InputFile *f : inputs)
     inputNames.push_back(f->getName());
-  llvm::sort(inputNames,
-             [](const StringRef &a, const StringRef &b) { return a < b; });
+  llvm::sort(inputNames);
+
   for (const StringRef &in : inputNames)
     addDep(DepOpCode::Input, in);
 

diff  --git a/lld/test/MachO/dependency-info.s b/lld/test/MachO/dependency-info.s
index f76605c35ae8..c2638d399c96 100644
--- a/lld/test/MachO/dependency-info.s
+++ b/lld/test/MachO/dependency-info.s
@@ -1,7 +1,4 @@
 # REQUIRES: x86
-## FIXME: Paths on windows have both `\` and '/', as a result, they are in a 
diff erent
-## order when sorted. Maybe create a separate test for that?
-# UNSUPPORTED: system-windows
 #
 # RUN: rm -rf %t
 # RUN: split-file %s %t


        


More information about the llvm-commits mailing list