Use toString to stringize sections and files.

[ruiu]

Summary

This patch changes the output format of --print-icf-sections.

[ruiu]

• restore print function

lld/ELF/ICF.cpp

void ICF<ELFT>::forEachClass(std::function<void(size_t, size_t)> Fn) {
   size_t Step = Sections.size() / NumShards;
   parallelForEachN(0, NumShards, [&](size_t I) {
     size_t End = (I == NumShards - 1) ? Sections.size() : (I + 1) * Step;
     forEachClassRange(I * Step, End, Fn);
   });
   ++Cnt;
 }
 
-static void print(const Twine &Prefix, InputSection *S) {
-  if (!Config->PrintIcfSections)
-    return;
-  std::string File = S->File ? S->File->getName() : "<internal>";
-  message(Prefix + " section '" + S->Name + "' from file '" + File + "'");
-}
-
 // The main function of ICF.
 template <class ELFT> void ICF<ELFT>::run() {
   // Collect sections to merge.
   for (InputSectionBase *Sec : InputSections)
     if (auto *S = dyn_cast<InputSection>(Sec))
       if (isEligible(S))
         Sections.push_back(S);
 
template <class ELFT> void ICF<ELFT>::run() {
   } while (Repeat);
 
   log("ICF needed " + Twine(Cnt) + " iterations");
 
   // Merge sections by the equivalence class.
   forEachClassRange(0, Sections.size(), [&](size_t Begin, size_t End) {
     if (End - Begin == 1)
       return;
-    print("selected", Sections[Begin]);
+    if (Config->PrintIcfSections)
+      message("selected section " + toString(Sections[Begin]));
     for (size_t I = Begin + 1; I < End; ++I) {
-      print("  removing identical", Sections[I]);
+      if (Config->PrintIcfSections)
+        message("  removing identical section " + toString(Sections[I]));
       Sections[Begin]->replace(Sections[I]);
     }
   });
 
   // Mark ARM Exception Index table sections that refer to folded code
   // sections as not live. These sections have an implict dependency
   // via the link order dependency.
   if (Config->EMachine == EM_ARM)

lld/test/ELF/icf-absolute.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/icf-absolute.s -o %t2
 # RUN: ld.lld %t %t2 -o %t3 --icf=all --print-icf-sections | FileCheck %s
 
-# CHECK: selected section '.text.f1' from file
-# CHECK:   removing identical section '.text.f2' from file
+# CHECK: selected section {{.*}}:(.text.f1)
+# CHECK:   removing identical section {{.*}}:(.text.f2)
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   .byte a1
 
 .section .text.f2, "ax"
 f2:
   .byte a2

lld/test/ELF/icf-comdat.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --icf=all --print-icf-sections | FileCheck %s
 
-# CHECK: selected section '.text.f1' from file [[T:'.*']]
-# CHECK:   removing identical section '.text.f2' from file [[T]]
+# CHECK: selected section {{.*}}:(.text.f1)
+# CHECK:   removing identical section {{.*}}:(.text.f2)
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1,"ax"
 f1:
   mov $60, %rax
   mov $42, %rdi
   syscall
 
 .section .text.f2,"axG",@progbits,foo,comdat
 f2:
   mov $60, %rax
   mov $42, %rdi
   syscall

lld/test/ELF/icf-i386.s

 # REQUIRES: x86
 # This test is to make sure that we can handle implicit addends properly.
 
 # RUN: llvm-mc -filetype=obj -triple=i386-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --icf=all --print-icf-sections 2>&1 | FileCheck %s
 
-# CHECK:     selected section '.text.f1' from file [[T:'.*']]
-# CHECK:       removing identical section '.text.f2' from file [[T]]
-# CHECK-NOT:   removing identical section '.text.f3' from file [[T]]
+# CHECK:     selected section: {{.*}}:(.text.f1)
+# CHECK:       removing identical section {{.*}}:(.text.f2)
+# CHECK-NOT:   removing identical section {{.*}}:(.text.f3)
 
 .globl _start, f1, f2, f3
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   movl $42, 4(%edi)
 
 .section .text.f2, "ax"
 f2:
   movl $42, 4(%edi)
 
 .section .text.f3, "ax"
 f3:
   movl $42, 8(%edi)

lld/test/ELF/icf-merge-sec.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/icf-merge-sec.s -o %t2
 # RUN: ld.lld %t %t2 -o %t3 --icf=all --print-icf-sections | FileCheck %s
 
-# CHECK: selected section '.text.f1' from file
-# CHECK:   removing identical section '.text.f2' from file
+# CHECK: selected section {{.*}}:(.text.f1)
+# CHECK:   removing identical section {{.*}}:(.text.f2)
 
 .section .rodata.str,"aMS",@progbits,1
 .asciz "foo"
 .asciz "string 1"
 .asciz "string 2"
 
 .section .text.f1,"ax"
 .globl f1
 f1:
 .quad .rodata.str

lld/test/ELF/icf-merge.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/icf-merge.s -o %t1
 # RUN: ld.lld %t %t1 -o %t1.out --icf=all --print-icf-sections | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/icf-merge2.s -o %t2
 # RUN: ld.lld %t %t2 -o %t3.out --icf=all --print-icf-sections | FileCheck --check-prefix=NOMERGE %s
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/icf-merge3.s -o %t3
 # RUN: ld.lld %t %t3 -o %t3.out --icf=all --print-icf-sections | FileCheck --check-prefix=NOMERGE %s
 
-# CHECK: selected section '.text.f1' from file
-# CHECK:   removing identical section '.text.f2' from file
+# CHECK: selected section {{.*}}:(.text.f1)
+# CHECK:   removing identical section {{.*}}:(.text.f2)
 
-# NOMERGE-NOT: selected section '.text.f
+# NOMERGE-NOT: selected section {{.*}}:(.text.f)
 
 .section .rodata.str,"aMS",@progbits,1
 foo:
 .asciz "foo"
 .asciz "string 1"
 .asciz "string 2"
 
 .section .text.f1,"ax"
 .globl f1
 f1:
 lea foo+42(%rip), %rax

lld/test/ELF/icf1.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --icf=all --print-icf-sections | FileCheck %s
 
-# CHECK: selected section '.text.f1' from file [[T:'.*']]
-# CHECK:   removing identical section '.text.f2' from file [[T]]
+# CHECK: selected section {{.*}}:(.text.f1)
+# CHECK:   removing identical section {{.*}}:(.text.f2)
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   mov $60, %rax
   mov $42, %rdi
   syscall
 
 .section .text.f2, "ax"
 f2:
   mov $60, %rax
   mov $42, %rdi
   syscall

lld/test/ELF/icf2.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/icf2.s -o %t2
 # RUN: ld.lld %t1 %t2 -o %t --icf=all --print-icf-sections 2>&1 | FileCheck %s
 
-# CHECK: selected section '.text.f1' from file
-# CHECK:   removing identical section '.text.f2' from file
+# CHECK: selected section {{.*}}:(.text.f1)
+# CHECK:   removing identical section {{.*}}:(.text.f2)
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   mov $60, %rdi
   call f2

lld/test/ELF/icf7.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --icf=all --print-icf-sections | FileCheck %s
 # RUN: llvm-objdump -t %t2 | FileCheck -check-prefix=ALIGN %s
 
-# CHECK: selected section '.text.f1' from file [[T:'.*']]
-# CHECK:   removing identical section '.text.f2' from file [[T]]
+# CHECK: selected section {{.*}}:(.text.f1)
+# CHECK:   removing identical section {{.*}}:(.text.f2)
 
 # ALIGN: 0000000000201000 .text 00000000 _start
 # ALIGN: 0000000000201100 .text 00000000 f1
 
 .globl _start, f1, f2
 _start:
   ret
 

lld/test/ELF/icf9.s

 # REQUIRES: x86
 
 ### Make sure that we do not merge data.
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --icf=all --verbose --print-icf-sections 2>&1 | FileCheck %s
 # RUN: llvm-readelf -S -W %t2 | FileCheck --check-prefix=SEC %s
 
 # SEC:  .rodata      PROGBITS  0000000000200120 000120 000002 00 A 0 0 1
 
-# CHECK-NOT: selected section '.rodata.d1'
-# CHECK-NOT: selected section '.rodata.d2'
+# CHECK-NOT: selected section {{.*}}:(.rodata.d1)
+# CHECK-NOT: selected section {{.*}}:(.rodata.d2)
 
 # We do merge rodata if passed --icf-data
 # RUN: ld.lld %t -o %t2 --icf=all --print-icf-sections --ignore-data-address-equality | \
 # RUN:   FileCheck --check-prefix=DATA %s
 # RUN: llvm-readelf -S -W %t2 | FileCheck --check-prefix=DATA-SEC %s
 
-# DATA: selected section '.rodata.d1' from file [[T:'.*']]
-# DATA:   removing identical section '.rodata.d2' from file [[T]]
+# DATA: selected section {{.*}}:(.rodata.d1)
+# DATA:   removing identical section {{.*}}:(.rodata.d2)
 
 # DATA-SEC:  .rodata      PROGBITS  0000000000200120 000120 000001 00 A 0 0 1
 
 .globl _start, d1, d2
 _start:
   ret
 
 .section .rodata.d1, "a"
 d1:
   .byte 1
 
 .section .rodata.d2, "a"
 d2:
   .byte 1

lld/test/ELF/print-icf.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/print-icf.s -o %t1
 # RUN: ld.lld %t %t1 -o %t2 --icf=all --print-icf-sections | FileCheck %s
 # RUN: ld.lld %t %t1 -o %t2 --icf=all --no-print-icf-sections --print-icf-sections | FileCheck %s
 # RUN: ld.lld %t %t1 -o %t2 --icf=all --print-icf-sections --no-print-icf-sections | FileCheck -allow-empty -check-prefix=PRINT %s
 
-# CHECK: selected section '.text.f2' from file [[T:'.*']]
-# CHECK:   removing identical section '.text.f4' from file [[T]]
-# CHECK:   removing identical section '.text.f7' from file [[T1:'.*']]
-# CHECK: selected section '.text.f1' from file [[T]]
-# CHECK:   removing identical section '.text.f3' from file [[T]]
-# CHECK:   removing identical section '.text.f5' from file [[T]]
-# CHECK:   removing identical section '.text.f6' from file [[T1]]
+# CHECK: selected section {{.*}}:(.text.f2)
+# CHECK:   removing identical section {{.*}}:(.text.f4)
+# CHECK:   removing identical section {{.*}}:(.text.f7)
+# CHECK: selected section {{.*}}:(.text.f1)
+# CHECK:   removing identical section {{.*}}:(.text.f3)
+# CHECK:   removing identical section {{.*}}:(.text.f5)
+# CHECK:   removing identical section {{.*}}:(.text.f6)
 
 # PRINT-NOT: selected
 # PRINT-NOT: removing
 
 .globl _start, f1, f2
 _start:
   ret