[PATCH] D43234: [ELF] - Fix case of using both --icf and --symbol-ordering-file together.

[George Rimar via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rLLD326179: [ELF] - Fix case of using both --icf and --symbol-ordering-file together. (authored by grimar, committed by ).

Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D43234

Files:
  ELF/Writer.cpp
  test/ELF/symbol-ordering-file-icf.s


Index: test/ELF/symbol-ordering-file-icf.s
===================================================================
--- test/ELF/symbol-ordering-file-icf.s
+++ test/ELF/symbol-ordering-file-icf.s
@@ -0,0 +1,32 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+# RUN: echo "zed" > %t.order
+# RUN: echo "bar" >> %t.order
+# RUN: echo "foo" >> %t.order
+# RUN: ld.lld --icf=all --symbol-ordering-file %t.order -shared %t.o -o %t.so
+# RUN: llvm-nm %t.so | FileCheck %s
+
+## Check that after ICF merges 'foo' and 'zed' we still
+## place them before 'bar', in according to ordering file.
+# CHECK-DAG: 0000000000001000 T foo
+# CHECK-DAG: 0000000000001000 T zed
+# CHECK-DAG: 0000000000001004 T bar
+
+.section .text.foo,"ax", at progbits
+.align 4
+.global foo
+foo:
+  retq
+
+.section .text.bar,"ax", at progbits
+.align 4
+.global bar
+bar:
+  nop
+  retq
+
+.section .text.zed,"ax", at progbits
+.align 4
+.global zed
+zed:
+  retq
Index: ELF/Writer.cpp
===================================================================
--- ELF/Writer.cpp
+++ ELF/Writer.cpp
@@ -1056,7 +1056,7 @@
         continue;
 
       if (auto *Sec = dyn_cast_or_null<InputSectionBase>(D->Section)) {
-        int &Priority = SectionOrder[Sec];
+        int &Priority = SectionOrder[cast<InputSectionBase>(Sec->Repl)];
         Priority = std::min(Priority, Ent.Priority);
       }
     }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D43234.136043.patch
Type: text/x-patch
Size: 1389 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180227/dc96c2d0/attachment.bin>