commit 641a7d04d8da412be1fc65c22c6b0521c260ab6f
author Vy Nguyen <vyng@google.com> Tue Mar 23 21:27:58 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Mon Apr 12 11:32:40 2021 -0700
tree 32d3580b071d2563c1ab94ca9599059607ecd2ce
parent ae3176ce9faf96c094b2d4cfef6c9b810ded62a0

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

This reverts commit 77b4230ed9bea541fd3fb04707e35308c2f34347.

New change: Fixed tests on windows

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

GitOrigin-RevId: dee5787d3ee5467b38f614c50023af0f7d1850d7

MachO/DriverUtils.cpp

diff --git a/MachO/DriverUtils.cpp b/MachO/DriverUtils.cpp
index a12e1c5..49bd83e 100644
--- a/MachO/DriverUtils.cpp
+++ b/MachO/DriverUtils.cpp
@@ -284,8 +284,8 @@
   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);
 

test/MachO/dependency-info.s

diff --git a/test/MachO/dependency-info.s b/test/MachO/dependency-info.s
index a05445b..9e69ea1 100644
--- a/test/MachO/dependency-info.s
+++ b/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 different
-## order when sorted. Maybe create a separate test for that?
-# UNSUPPORTED: system-windows
 #
 # RUN: rm -rf %t
 # RUN: split-file %s %t
@@ -16,16 +13,17 @@
 # RUN: %python %S/Inputs/DependencyDump.py %t/deps_info.out | FileCheck %s
 
 # CHECK: lld-version: {{.*}}LLD {{.*}}
-# CHECK-DAG: input-file: {{.*}}/bar.a
-# CHECK-DAG: input-file: {{.*}}/libfoo.dylib
-# CHECK-DAG: input-file: {{.*}}/libSystem.tbd
-# CHECK-DAG: input-file: {{.*}}/main.o
+
+# CHECK-DAG: input-file: {{.*}}{{[/\]}}bar.a
+# CHECK-DAG: input-file: {{.*}}{{[/\]}}libfoo.dylib
+# CHECK-DAG: input-file: {{.*}}{{[/\]}}libSystem.tbd
+# CHECK-DAG: input-file: {{.*}}{{[/\]}}main.o
 # CHECK-DAG: input-file: {{.*}}bar.o
 
-# CHECK-NEXT: not-found: {{.*}}/libdyld.dylib
+# CHECK-NEXT: not-found: {{.*}}{{[/\]}}libdyld.{{.*}}
 ## There could be more not-found here but we are not checking those because it's brittle.
 
-# CHECK: output-file: {{.*}}/test.out
+# CHECK: output-file: {{.*}}{{[/\]}}test.out
 
 #--- foo.s
 .globl __Z3foo