address maskray review comments

Author: pranavk

lld/ELF/ICF.cpp

@@ -602,7 +602,8 @@ template <class ELFT> void ICF<ELFT>::run() {
     fold(sym);
     auto it = symbolEquivalence.findLeader(sym);
     if (it != symbolEquivalence.member_end() && *it != sym) {
-      print() << "Redirecting " << sym->getName() << " to " << (*it)->getName();
+      print() << "redirecting '" << sym->getName() << "' in symtab to '"
+              << (*it)->getName() << "'";
       ctx.symtab->redirect(sym, *it);
     }
   }
@@ -612,8 +613,8 @@ template <class ELFT> void ICF<ELFT>::run() {
     for (Symbol *&sym : file->getMutableGlobalSymbols()) {
       auto it = symbolEquivalence.findLeader(sym);
       if (it != symbolEquivalence.member_end() && *it != sym) {
-        print() << "Redirecting " << sym->getName() << " to "
-                << (*it)->getName();
+        print() << "redirecting '" << sym->getName() << "' to '"
+                << (*it)->getName() << "'";
         sym = *it;
       }
     }

lld/test/ELF/aarch64-got-merging-icf.s

@@ -1,13 +1,21 @@
 // REQUIRES: aarch64
 
 # RUN: llvm-mc -filetype=obj -triple=aarch64 %s -o %t
+# RUN: llvm-mc -filetype=obj -crel -triple=aarch64 %s -o %tcrel
 # RUN: ld.lld %t -o %t2 --icf=all
+# RUN: ld.lld %tcrel -o %tcrel2 --icf=all
+
 # RUN: llvm-objdump --section-headers %t2 | FileCheck %s --check-prefix=EXE
+# RUN: llvm-objdump --section-headers %tcrel2 | FileCheck %s --check-prefix=EXE
 
 # RUN: ld.lld -shared %t -o %t3 --icf=all
+# RUN: ld.lld -shared %tcrel -o %tcrel3 --icf=all
+
 # RUN: llvm-objdump --section-headers %t3 | FileCheck %s --check-prefix=DSO
+# RUN: llvm-objdump --section-headers %tcrel3 | FileCheck %s --check-prefix=DSO
 
-## All .rodata.* sections should merge into a single GOT entry
+## All global g* symbols should merge into a single GOT entry while non-global
+## gets its own GOT entry.
 # EXE: {{.*}}.got 00000010{{.*}}
 
 ## When symbols are preemptible in DSO mode, GOT entries wouldn't be merged
@@ -50,7 +58,8 @@ bl f1_\index
 
 .endm
 
-# another set of sections merging: g1 <- g2
+## Another set of sections merging: g1 <- g2. Linker should be able to
+## resolve both g1 and g2 to g0 based on ICF on previous sections.
 
 .section .text.t1_0,"ax",@progbits
 t1_0:

lld/test/ELF/icf-preemptible.s

@@ -17,9 +17,13 @@
 # EXE-NEXT: selected section {{.*}}:(.text.h1)
 # EXE-NEXT:   removing identical section {{.*}}:(.text.h2)
 # EXE-NEXT:   removing identical section {{.*}}:(.text.h3)
-# EXE-NEXT: Redirecting f2 to f1
-# EXE-NEXT: Redirecting g2 to g1
-# EXE-NEXT: Redirecting g3 to g1
+# EXE-NEXT: redirecting 'f2' in symtab to 'f1'
+# EXE-NEXT: redirecting 'g2' in symtab to 'g1'
+# EXE-NEXT: redirecting 'g3' in symtab to 'g1'
+# EXE-NEXT: redirecting 'f2' to 'f1'
+# EXE-NEXT: redirecting 'g2' to 'g1'
+# EXE-NEXT: redirecting 'g3' to 'g1'
+# EXE-NOT:  {{.}}
 
 ## Definitions are preemptible in a DSO. Only leaf functions can be folded.
 # DSO-NOT:  {{.}}