[lld] r277202 - Don't crash if PT_TLS is empty.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Fri Jul 29 14:24:27 2016
New Revision: 277202

URL: http://llvm.org/viewvc/llvm-project?rev=277202&view=rev
Log:
Don't crash if PT_TLS is empty.

Added:
    lld/trunk/test/ELF/linkerscript/empty-tls.s
Modified:
    lld/trunk/ELF/Writer.cpp

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=277202&r1=277201&r2=277202&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Fri Jul 29 14:24:27 2016
@@ -1132,7 +1132,8 @@ template <class ELFT> void Writer<ELFT>:
     // so round up the size to make sure the offsets are correct.
     if (H.p_type == PT_TLS) {
       Out<ELFT>::TlsPhdr = &H;
-      H.p_memsz = alignTo(H.p_memsz, H.p_align);
+      if (H.p_memsz)
+        H.p_memsz = alignTo(H.p_memsz, H.p_align);
     }
   }
 }

Added: lld/trunk/test/ELF/linkerscript/empty-tls.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/empty-tls.s?rev=277202&view=auto
==============================================================================
--- lld/trunk/test/ELF/linkerscript/empty-tls.s (added)
+++ lld/trunk/test/ELF/linkerscript/empty-tls.s Fri Jul 29 14:24:27 2016
@@ -0,0 +1,14 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+// RUN: echo  "PHDRS { ph_tls PT_TLS; }" > %t.script
+// RUN: ld.lld -o %t.so -T %t.script %t.o -shared
+// RUN: llvm-readobj -l %t.so | FileCheck %s
+
+// test that we don't crash with an empty PT_TLS
+
+// CHECK:      Type: PT_TLS
+// CHECK-NEXT: Offset: 0x0
+// CHECK-NEXT: VirtualAddress: 0x0
+// CHECK-NEXT: PhysicalAddress: 0x0
+// CHECK-NEXT: FileSize: 0
+// CHECK-NEXT: MemSize: 0