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

[int3]

Thanks!

[thakis]

The test fails on Windows: http://45.33.8.238/win/35613/step_10.txt

PTAL, and please revert for now if it takes a while to fix.

[int3]

@oontvoo next time let's wait for the tests to finish before landing, especially if it's something that isn't testable locally

[oontvoo]

Updated path-expectations to accept both backslash and forwardslash.

Will wait and commit this tomorrow.

[oontvoo]

rebase

[oontvoo]

updated diff

lld/MachO/DriverUtils.cpp

void macho::DependencyTracker::write(llvm::StringRef version,
 
   addDep(DepOpCode::Version, version);
 
   // Sort the input by its names.
   std::vector<StringRef> inputNames;
   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);
 
   for (const std::string &f : notFounds)
     addDep(DepOpCode::NotFound, f);
 
   addDep(DepOpCode::Output, output);
 }

lld/test/MachO/dependency-info.s

 # 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
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/foo.o %t/foo.s
 # RUN: %lld -dylib -o %t/libfoo.dylib %t/foo.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/bar.o %t/bar.s
 # RUN: llvm-ar csr  %t/bar.a %t/bar.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/main.o %t/main.s
 
 # RUN: %lld %t/main.o %t/bar.a %t/libfoo.dylib -lSystem -o %t/test.out -dependency_info %t/deps_info.out
 # 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
 __Z3foo:
   ret
 
 #--- bar.s
 .globl _bar