[PATCH] D61857: [LTO] Improve readability of module IDs

[Igor Kudrin via Phabricator via llvm-commits]

ikudrin updated this revision to Diff 199580.
ikudrin added a comment.

- Changed the format to <archive name>(<object name> at <offset>);
- Changed "if" to "?:";
- Simplified a check in the tests.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D61857/new/

https://reviews.llvm.org/D61857

Files:
  ELF/InputFiles.cpp
  test/ELF/lto/Inputs/irmover-warning.ll
  test/ELF/lto/irmover-warning.ll


Index: test/ELF/lto/irmover-warning.ll
===================================================================
--- /dev/null
+++ test/ELF/lto/irmover-warning.ll
@@ -0,0 +1,22 @@
+; RUN: llvm-as -o %t1.bc %s
+; RUN: llvm-as -o %t2.bc %S/Inputs/irmover-warning.ll
+; RUN: rm -f %t.a
+; RUN: llvm-ar rcs %t.a %t2.bc
+; RUN: ld.lld %t1.bc %t.a -o %t 2>&1 | FileCheck %s
+
+; CHECK: warning: linking module flags 'foo': IDs have conflicting values
+; CHECK-SAME: irmover-warning.ll.tmp.a(irmover-warning.ll.tmp2.bc at {{[0-9]+}})
+
+target triple = "x86_64-unknown-linux-gnu"
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+
+declare void @f()
+
+define void @g() {
+  call void @f()
+  ret void
+}
+
+!0 = !{ i32 2, !"foo", i32 1 }
+
+!llvm.module.flags = !{ !0 }
Index: test/ELF/lto/Inputs/irmover-warning.ll
===================================================================
--- /dev/null
+++ test/ELF/lto/Inputs/irmover-warning.ll
@@ -0,0 +1,10 @@
+target triple = "x86_64-unknown-linux-gnu"
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+
+define void @f() {
+  ret void
+}
+
+!0 = !{ i32 2, !"foo", i32 2 }
+
+!llvm.module.flags = !{ !0 }
Index: ELF/InputFiles.cpp
===================================================================
--- ELF/InputFiles.cpp
+++ ELF/InputFiles.cpp
@@ -1141,10 +1141,11 @@
   // into consideration at LTO time (which very likely causes undefined
   // symbols later in the link stage). So we append file offset to make
   // filename unique.
-  MemoryBufferRef MBRef(
-      MB.getBuffer(),
-      Saver.save(ArchiveName + Path +
-                 (ArchiveName.empty() ? "" : utostr(OffsetInArchive))));
+  StringRef Name = ArchiveName.empty()
+                       ? Saver.save(Path)
+                       : Saver.save(ArchiveName + "(" + Path + " at " +
+                                    utostr(OffsetInArchive) + ")");
+  MemoryBufferRef MBRef(MB.getBuffer(), Name);
 
   Obj = CHECK(lto::InputFile::create(MBRef), this);
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D61857.199580.patch
Type: text/x-patch
Size: 1991 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190515/d54e283f/attachment.bin>