[lld] 9df7daa - [lld-macho] Tweak the names we give to archive members

[Jez Ng via llvm-commits]

Author: Jez Ng
Date: 2023-04-20T17:24:06-04:00
New Revision: 9df7daa5ef912957c708382c0860e01d1cd3b4c8

URL: https://github.com/llvm/llvm-project/commit/9df7daa5ef912957c708382c0860e01d1cd3b4c8
DIFF: https://github.com/llvm/llvm-project/commit/9df7daa5ef912957c708382c0860e01d1cd3b4c8.diff

LOG: [lld-macho] Tweak the names we give to archive members

In particular, make it `foo.a(foo.o)$ARCHIVE_OFFSET`. The goal is to
make it more similar to both ld64 implementation, which uses the
`foo.a(foo.o)$MODULE_ID` format. We dump some of these names in LTO
code, so matching ld64's format is helpful. This format is also more
similar to LLD-ELF's, which is `foo.a(foo.o at $ARCHIVE_OFFSET)`.

Reviewed By: #lld-macho, oontvoo

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

Added: 
    

Modified: 
    lld/MachO/InputFiles.cpp
    lld/test/MachO/lto-archivecollision.ll

Removed: 
    


################################################################################
diff  --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp
index 9f0c003d6aa2a..31372046840e1 100644
--- a/lld/MachO/InputFiles.cpp
+++ b/lld/MachO/InputFiles.cpp
@@ -2207,10 +2207,9 @@ BitcodeFile::BitcodeFile(MemoryBufferRef mb, StringRef archiveName,
   MemoryBufferRef mbref(mb.getBuffer(),
                         saver().save(archiveName.empty()
                                          ? path
-                                         : archiveName +
-                                               sys::path::filename(path) +
+                                         : archiveName + "(" +
+                                               sys::path::filename(path) + ")" +
                                                utostr(offsetInArchive)));
-
   obj = check(lto::InputFile::create(mbref));
   if (lazy)
     parseLazy();

diff  --git a/lld/test/MachO/lto-archivecollision.ll b/lld/test/MachO/lto-archivecollision.ll
index 4acbe79bdc180..993671a890502 100644
--- a/lld/test/MachO/lto-archivecollision.ll
+++ b/lld/test/MachO/lto-archivecollision.ll
@@ -13,15 +13,15 @@
 ; RUN: %lld -save-temps %t/main.o %t/liba.a %t/libb.a -o %t/test
 ; RUN: FileCheck %s --check-prefix=DIFFERENT-ARCHIVES < %t/test.resolution.txt
 
-; SAME-ARCHIVE: libbar.abar.o[[#OFFSET:]]
-; SAME-ARCHIVE-NEXT: -r={{.*}}/libbar.abar.o[[#OFFSET:]],_foo,p
-; SAME-ARCHIVE-NEXT: libbar.abar.o[[#OTHEROFFSET:]]
-; SAME-ARCHIVE-NEXT: -r={{.*}}/libbar.abar.o[[#OTHEROFFSET:]],_bar,p
-
-; DIFFERENT-ARCHIVES: liba.abar.o[[#OFFSET:]]
-; DIFFERENT-ARCHIVES-NEXT: -r={{.*}}/liba.abar.o[[#OFFSET:]],_foo,p
-; DIFFERENT-ARCHIVES-NEXT: libb.abar.o[[#OTHEROFFSET:]]
-; DIFFERENT-ARCHIVES-NEXT: -r={{.*}}/libb.abar.o[[#OTHEROFFSET:]],_bar,p
+; SAME-ARCHIVE: libbar.a(bar.o)[[#OFFSET:]]
+; SAME-ARCHIVE-NEXT: -r={{.*}}/libbar.a(bar.o)[[#OFFSET:]],_foo,p
+; SAME-ARCHIVE-NEXT: libbar.a(bar.o)[[#OTHEROFFSET:]]
+; SAME-ARCHIVE-NEXT: -r={{.*}}/libbar.a(bar.o)[[#OTHEROFFSET:]],_bar,p
+
+; DIFFERENT-ARCHIVES: liba.a(bar.o)[[#OFFSET:]]
+; DIFFERENT-ARCHIVES-NEXT: -r={{.*}}/liba.a(bar.o)[[#OFFSET:]],_foo,p
+; DIFFERENT-ARCHIVES-NEXT: libb.a(bar.o)[[#OTHEROFFSET:]]
+; DIFFERENT-ARCHIVES-NEXT: -r={{.*}}/libb.a(bar.o)[[#OTHEROFFSET:]],_bar,p
 
 ;--- main.ll