[llvm] r278070 - Revert "Do not ignore SizeOfOptionalHeader in COFF header even if PE header is not present."

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Mon Aug  8 18:07:03 2016
New Revision: 278070

URL: http://llvm.org/viewvc/llvm-project?rev=278070&view=rev
Log:
Revert "Do not ignore SizeOfOptionalHeader in COFF header even if PE header is not present."

This reverts commit r278066 to unbreak buildbots.

Modified:
    llvm/trunk/lib/Object/COFFObjectFile.cpp

Modified: llvm/trunk/lib/Object/COFFObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFObjectFile.cpp?rev=278070&r1=278069&r2=278070&view=diff
==============================================================================
--- llvm/trunk/lib/Object/COFFObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/COFFObjectFile.cpp Mon Aug  8 18:07:03 2016
@@ -716,10 +716,9 @@ COFFObjectFile::COFFObjectFile(MemoryBuf
     }
     if ((EC = getObject(DataDirectory, Data, DataDirAddr, DataDirSize)))
       return;
+    CurPtr += COFFHeader->SizeOfOptionalHeader;
   }
 
-  CurPtr += COFFHeader->SizeOfOptionalHeader;
-
   if ((EC = getObject(SectionTable, Data, base() + CurPtr,
                       (uint64_t)getNumberOfSections() * sizeof(coff_section))))
     return;