[PATCH] D47234: ELF: Allow ICF on .data.rel.ro sections.

[Peter Collingbourne via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL333040: ELF: Allow ICF on .data.rel.ro sections. (authored by pcc, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D47234?vs=148127&id=148129#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D47234

Files:
  lld/trunk/ELF/ICF.cpp
  lld/trunk/test/ELF/icf-relro.s


Index: lld/trunk/ELF/ICF.cpp
===================================================================
--- lld/trunk/ELF/ICF.cpp
+++ lld/trunk/ELF/ICF.cpp
@@ -162,8 +162,13 @@
 
 // Returns true if section S is subject of ICF.
 static bool isEligible(InputSection *S) {
-  if (!S->Live || S->KeepUnique || !(S->Flags & SHF_ALLOC) ||
-      (S->Flags & SHF_WRITE))
+  if (!S->Live || S->KeepUnique || !(S->Flags & SHF_ALLOC))
+    return false;
+
+  // Don't merge writable sections. .data.rel.ro sections are marked as writable
+  // but are semantically read-only.
+  if ((S->Flags & SHF_WRITE) && S->Name != ".data.rel.ro" &&
+      !S->Name.startswith(".data.rel.ro."))
     return false;
 
   // Don't merge read only data sections unless
Index: lld/trunk/test/ELF/icf-relro.s
===================================================================
--- lld/trunk/test/ELF/icf-relro.s
+++ lld/trunk/test/ELF/icf-relro.s
@@ -0,0 +1,12 @@
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+# RUN: ld.lld %t -o %t2 --icf=all --ignore-data-address-equality --print-icf-sections | FileCheck %s
+
+# CHECK: selected section {{.*}}:(.data.rel.ro)
+# CHECK:   removing identical section {{.*}}:(.data.rel.ro.foo)
+
+.section .data.rel.ro,"aw"
+.quad foo
+
+.section .data.rel.ro.foo,"aw"
+foo:
+.quad foo


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D47234.148129.patch
Type: text/x-patch
Size: 1308 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180522/c12476a4/attachment.bin>