[llvm-commits] [lld] r171591 - /lld/trunk/lib/ReaderWriter/ELF/WriterELF.cpp

Reid Kleckner reid at kleckner.net
Fri Jan 4 18:21:42 PST 2013


Author: rnk
Date: Fri Jan  4 20:21:42 2013
New Revision: 171591

URL: http://llvm.org/viewvc/llvm-project?rev=171591&view=rev
Log:
Avoid MSVCRT assertion on comparing phdr iterators

Modified:
    lld/trunk/lib/ReaderWriter/ELF/WriterELF.cpp

Modified: lld/trunk/lib/ReaderWriter/ELF/WriterELF.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/WriterELF.cpp?rev=171591&r1=171590&r2=171591&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/WriterELF.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/WriterELF.cpp Fri Jan  4 20:21:42 2013
@@ -1213,7 +1213,9 @@
   ELFProgramHeader()
   : Chunk<target_endianness, max_align, is64Bits>(
       "elfphdr",
-      Chunk<target_endianness, max_align, is64Bits>::K_ELFProgramHeader) { }
+      Chunk<target_endianness, max_align, is64Bits>::K_ELFProgramHeader) {
+    resetProgramHeaders();
+  }
 
   bool addSegment(Segment<target_endianness, max_align, is64Bits> *segment) {
     Elf_Phdr *phdr = nullptr;





More information about the llvm-commits mailing list