[PATCH] D40236: COFF: Stop requiring comdat sections to have an external leader to participate in ICF.

[Peter Collingbourne via Phabricator via llvm-commits]

pcc created this revision.

This requirement was added in r254578 to fix pr25686. However, it
appears to have originated from a misdiagnosis of the problem: link.exe
refused to merge the two sections because they are non-executable,
not because they have internal leaders. If I set up a similar scenario
with functions instead of globals I see that link.exe merges them.


https://reviews.llvm.org/D40236

Files:
  lld/COFF/ICF.cpp
  lld/test/COFF/icf-executable.s


Index: lld/test/COFF/icf-executable.s
===================================================================
--- /dev/null
+++ lld/test/COFF/icf-executable.s
@@ -0,0 +1,18 @@
+# RUN: llvm-mc -triple=x86_64-windows-msvc %s -filetype=obj -o %t.obj
+# RUN: lld-link -entry:main %t.obj -out:%t.exe -verbose 2>&1 | FileCheck %s
+
+# CHECK: Selected internal
+# CHECK:   Removed f2
+
+.section .text,"xr",one_only,internal
+internal:
+.globl main
+main:
+call f2
+ret
+
+.section .text,"xr",one_only,f2
+.globl f2
+f2:
+call main
+ret
Index: lld/COFF/ICF.cpp
===================================================================
--- lld/COFF/ICF.cpp
+++ lld/COFF/ICF.cpp
@@ -82,10 +82,8 @@
   if (!C->isCOMDAT() || !C->isLive() || Writable)
     return false;
 
-  // Code sections with external symbols are eligible.
-  bool Global = C->Sym && C->Sym->isExternal();
-  bool Executable = C->getPermissions() & llvm::COFF::IMAGE_SCN_MEM_EXECUTE;
-  if (Global && Executable)
+  // Code sections are eligible.
+  if (C->getPermissions() & llvm::COFF::IMAGE_SCN_MEM_EXECUTE)
     return true;
 
   // .xdata unwind info sections are eligble.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40236.123541.patch
Type: text/x-patch
Size: 1128 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171120/03698732/attachment.bin>