[lld-macho] Have toString() emit full path to archive files

[int3]

Summary

It doesn't make sense to take just the base filename for archives when we emit
the full path for object files. (LLD-ELF emits the full path too.)

This will also make it easier to write a proper test for D100147: [lld-macho] Re-root absolute input file paths if -syslibroot is specified.

[oontvoo]

lld/test/MachO/why-load.s

31

perhaps '+'? ( .* could technically be empty)

[int3]

• -> +

lld/MachO/InputFiles.cpp

std::string lld::toString(const InputFile *f) {
 
   // Multiple dylibs can be defined in one .tbd file.
   if (auto dylibFile = dyn_cast<DylibFile>(f))
     if (f->getName().endswith(".tbd"))
       return (f->getName() + "(" + dylibFile->dylibName + ")").str();
 
   if (f->archiveName.empty())
     return std::string(f->getName());
-  return (path::filename(f->archiveName) + "(" + path::filename(f->getName()) +
-          ")")
-      .str();
+  return (f->archiveName + "(" + path::filename(f->getName()) + ")").str();
 }
 
 SetVector<InputFile *> macho::inputFiles;
 std::unique_ptr<TarWriter> macho::tar;
 int InputFile::idCount = 0;
 
 // Open a given file path and return it as a memory-mapped file.
 Optional<MemoryBufferRef> macho::readFile(StringRef path) {

lld/test/MachO/invalid/undefined-symbol.s

 # REQUIRES: x86
 # RUN: rm -rf %t
 # RUN: split-file %s %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/main.s -o %t/main.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/foo.s -o %t/foo.o
 # RUN: llvm-ar crs %t/foo.a %t/foo.o
 # RUN: not %lld -o /dev/null %t/main.o 2>&1 | \
 # RUN:     FileCheck %s -DSYM=_foo -DFILENAME=%t/main.o
 # RUN: not %lld -o /dev/null %t/main.o %t/foo.a 2>&1 | \
 # RUN:     FileCheck %s -DSYM=_bar -DFILENAME='foo.a(foo.o)'
 # RUN: not %lld -o /dev/null %t/main.o -force_load %t/foo.a 2>&1 | \
 # RUN:     FileCheck %s -DSYM=_bar -DFILENAME='foo.a(foo.o)'
 # CHECK: error: undefined symbol: [[SYM]]
-# CHECK-NEXT: >>> referenced by [[FILENAME]]
+# CHECK-NEXT: >>> referenced by {{.*}}[[FILENAME]]
 
 #--- foo.s
 .globl _foo
 .text
 _foo:
   callq _bar
   retq
 
 #--- main.s
 .globl _main
 .text
 _main:
   callq _foo
   movq $0, %rax
   retq

lld/test/MachO/u.s

 # RUN:     FileCheck %s --check-prefix=NOFOO --allow-empty
 
 # RUN: %lld %t/main.o %t/lib.a -u _foo -o /dev/null -why_load | \
 # RUN:     FileCheck %s --check-prefix=FOO
 
 # RUN: not %lld %t/main.o %t/lib.a -u _asdf -o /dev/null 2>&1 | \
 # RUN:     FileCheck %s --check-prefix=UNDEF
 
-# NOFOO-NOT: _foo forced load of lib.a(foo.o)
-# FOO: _foo forced load of lib.a(foo.o)
+# NOFOO-NOT: _foo forced load of {{.*}}lib.a(foo.o)
+# FOO: _foo forced load of {{.*}}lib.a(foo.o)
 # UNDEF: error: undefined symbol: _asdf
 
 #--- foo.s
 .globl _foo
 _foo:
   ret
 
 #--- main.s
 .globl _main
 _main:
   ret
 

lld/test/MachO/why-load.s

 # RUN:     FileCheck %s --check-prefix=WHYOBJC
 # RUN: %lld %t/main.o -force_load %t/lib.a -o /dev/null -ObjC -why_load | \
 # RUN:     FileCheck %s --check-prefix=WHYOBJCFORCE
 # RUN: %lld %t/main.o %t/lib.a -o /dev/null -ObjC -all_load -why_load | \
 # RUN:     FileCheck %s --check-prefix=WHYOBJCALL
 # RUN: %lld %t/main.o -force_load %t/lib.a -o /dev/null -ObjC -all_load -why_load | \
 # RUN:     FileCheck %s --check-prefix=WHYOBJCALLFORCE
 
-# WHY-DAG: _bar forced load of lib.a(bar.o)
-# WHY-DAG: __Z3foo forced load of lib.a(foo.o)
-# WHY-NOT: {{.*}} forced load of lib.a(objc.o)
-
-# WHYFORCE-DAG: -force_load forced load of lib.a(bar.o)
-# WHYFORCE-DAG: -force_load forced load of lib.a(foo.o)
-# WHYFORCE-DAG: -force_load forced load of lib.a(objc.o)
-
-# WHYALL-DAG: -all_load forced load of lib.a(bar.o)
-# WHYALL-DAG: -all_load forced load of lib.a(foo.o)
-# WHYALL-DAG: -all_load forced load of lib.a(objc.o)
-
-# WHYALLFORCE-DAG: -force_load forced load of lib.a(bar.o)
-# WHYALLFORCE-DAG: -force_load forced load of lib.a(foo.o)
-# WHYALLFORCE-DAG: -force_load forced load of lib.a(objc.o)
-
-# WHYOBJC-DAG: _bar forced load of lib.a(bar.o)
-# WHYOBJC-DAG: __Z3foo forced load of lib.a(foo.o)
-# WHYOBJC-DAG: -ObjC forced load of lib.a(objc.o)
-
-# WHYOBJCFORCE-DAG: -force_load forced load of lib.a(bar.o)
-# WHYOBJCFORCE-DAG: -force_load forced load of lib.a(foo.o)
-# WHYOBJCFORCE-DAG: -force_load forced load of lib.a(objc.o)
-
-# WHYOBJCALL-DAG: -all_load forced load of lib.a(bar.o)
-# WHYOBJCALL-DAG: -all_load forced load of lib.a(foo.o)
-# WHYOBJCALL-DAG: -all_load forced load of lib.a(objc.o)
-
-# WHYOBJCALLFORCE-DAG: -force_load forced load of lib.a(bar.o)
-# WHYOBJCALLFORCE-DAG: -force_load forced load of lib.a(foo.o)
-# WHYOBJCALLFORCE-DAG: -force_load forced load of lib.a(objc.o)
+# WHY-DAG: _bar forced load of {{.*}}lib.a(bar.o)
+# WHY-DAG: __Z3foo forced load of {{.*}}lib.a(foo.o)
+# WHY-NOT: {{.*}} forced load of {{.*}}lib.a(objc.o)
+
+# WHYFORCE-DAG: -force_load forced load of {{.*}}lib.a(bar.o)
+# WHYFORCE-DAG: -force_load forced load of {{.*}}lib.a(foo.o)
+# WHYFORCE-DAG: -force_load forced load of {{.*}}lib.a(objc.o)
+
+# WHYALL-DAG: -all_load forced load of {{.*}}lib.a(bar.o)
+# WHYALL-DAG: -all_load forced load of {{.*}}lib.a(foo.o)
+# WHYALL-DAG: -all_load forced load of {{.*}}lib.a(objc.o)
+
+# WHYALLFORCE-DAG: -force_load forced load of {{.*}}lib.a(bar.o)
+# WHYALLFORCE-DAG: -force_load forced load of {{.*}}lib.a(foo.o)
+# WHYALLFORCE-DAG: -force_load forced load of {{.*}}lib.a(objc.o)
+
+# WHYOBJC-DAG: _bar forced load of {{.*}}lib.a(bar.o)
+# WHYOBJC-DAG: __Z3foo forced load of {{.*}}lib.a(foo.o)
+# WHYOBJC-DAG: -ObjC forced load of {{.*}}lib.a(objc.o)
+
+# WHYOBJCFORCE-DAG: -force_load forced load of {{.*}}lib.a(bar.o)
+# WHYOBJCFORCE-DAG: -force_load forced load of {{.*}}lib.a(foo.o)
+# WHYOBJCFORCE-DAG: -force_load forced load of {{.*}}lib.a(objc.o)
+
+# WHYOBJCALL-DAG: -all_load forced load of {{.*}}lib.a(bar.o)
+# WHYOBJCALL-DAG: -all_load forced load of {{.*}}lib.a(foo.o)
+# WHYOBJCALL-DAG: -all_load forced load of {{.*}}lib.a(objc.o)
+
+# WHYOBJCALLFORCE-DAG: -force_load forced load of {{.*}}lib.a(bar.o)
+# WHYOBJCALLFORCE-DAG: -force_load forced load of {{.*}}lib.a(foo.o)
+# WHYOBJCALLFORCE-DAG: -force_load forced load of {{.*}}lib.a(objc.o)
 
 #--- objc.s
 .section __DATA,__objc_catlist
 .quad 0x1234
 
 #--- foo.s
 .globl __Z3foo
 __Z3foo: