[lld] r339680 - [LLD][ELF] - Eliminate dead code from OffsetGetter::get().

George Rimar via llvm-commits llvm-commits at lists.llvm.org
Tue Aug 14 07:20:34 PDT 2018


Author: grimar
Date: Tue Aug 14 07:20:34 2018
New Revision: 339680

URL: http://llvm.org/viewvc/llvm-project?rev=339680&view=rev
Log:
[LLD][ELF] - Eliminate dead code from OffsetGetter::get().

We have a dead piece of code there which is impossible to trigger
using regular objects I believe.
Patch removes it and adds a test case showing how this condition
can be triggered with use of a broken object and crash the linker.

Added:
    lld/trunk/test/ELF/invalid/ehframe-broken-relocation.test
Modified:
    lld/trunk/ELF/Relocations.cpp

Modified: lld/trunk/ELF/Relocations.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.cpp?rev=339680&r1=339679&r2=339680&view=diff
==============================================================================
--- lld/trunk/ELF/Relocations.cpp (original)
+++ lld/trunk/ELF/Relocations.cpp Tue Aug 14 07:20:34 2018
@@ -692,7 +692,7 @@ public:
     while (I != Pieces.size() && Pieces[I].InputOff + Pieces[I].Size <= Off)
       ++I;
     if (I == Pieces.size())
-      return Off;
+      fatal(".eh_frame: relocation is not in any piece");
 
     // Pieces must be contiguous, so there must be no holes in between.
     assert(Pieces[I].InputOff <= Off && "Relocation not in any piece");

Added: lld/trunk/test/ELF/invalid/ehframe-broken-relocation.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid/ehframe-broken-relocation.test?rev=339680&view=auto
==============================================================================
--- lld/trunk/test/ELF/invalid/ehframe-broken-relocation.test (added)
+++ lld/trunk/test/ELF/invalid/ehframe-broken-relocation.test Tue Aug 14 07:20:34 2018
@@ -0,0 +1,31 @@
+# RUN: yaml2obj %s -o %t.o
+# RUN: not ld.lld --icf=all %t.o -o /dev/null 2>&1 | FileCheck %s
+# CHECK: .eh_frame: relocation is not in any piece
+
+!ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  OSABI:           ELFOSABI_FREEBSD
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Name:            .eh_frame
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_ALLOC]
+    Content:         "1400000000000000017a5200017810011b0c070890010000140000001c00000000000000000000000000000000000000"
+  - Name:            .rela.eh_frame
+    Type:            SHT_RELA
+    Link:            .symtab
+    Info:            .eh_frame
+    Relocations:
+      - Offset:          0x99999999
+        Symbol:          zed
+        Type:            R_X86_64_64
+Symbols:
+  Global:
+    - Name:     zed
+      Type:     STT_FUNC
+      Section:  .eh_frame
+      Value:    0x0
+      Size:     8




More information about the llvm-commits mailing list