[llvm] r216647 - MC: Don't crash when the COFF section limit is reached

[David Majnemer]

Author: majnemer
Date: Wed Aug 27 23:02:50 2014
New Revision: 216647

URL: http://llvm.org/viewvc/llvm-project?rev=216647&view=rev
Log:
MC: Don't crash when the COFF section limit is reached

I've decided not to commit a test, it takes 2.5 seconds to run on my an
incredibly strong machine.

Modified:
    llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp

Modified: llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp?rev=216647&r1=216646&r2=216647&view=diff
==============================================================================
--- llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/WinCOFFObjectWriter.cpp Wed Aug 27 23:02:50 2014
@@ -840,18 +840,23 @@ void WinCOFFObjectWriter::RecordRelocati
 void WinCOFFObjectWriter::WriteObject(MCAssembler &Asm,
                                       const MCAsmLayout &Layout) {
   // Assign symbol and section indexes and offsets.
-  Header.NumberOfSections = 0;
+  size_t NumberOfSections = 0;
 
   DenseMap<COFFSection *, uint16_t> SectionIndices;
-  for (auto & Section : Sections) {
-    size_t Number = ++Header.NumberOfSections;
-    SectionIndices[Section.get()] = Number;
+  for (const auto &Section : Sections) {
+    size_t Number = ++NumberOfSections;
+    SectionIndices[Section.get()] = static_cast<uint16_t>(Number);
     MakeSectionReal(*Section, Number);
   }
 
+  if (NumberOfSections > COFF::MaxNumberOfSections)
+    report_fatal_error(
+        "PE COFF object files can't have more than 65,299 sections");
+
+  Header.NumberOfSections = static_cast<uint16_t>(NumberOfSections);
   Header.NumberOfSymbols = 0;
 
-  for (auto & Symbol : Symbols) {
+  for (auto &Symbol : Symbols) {
     // Update section number & offset for symbols that have them.
     if (Symbol->Section)
       Symbol->Data.SectionNumber = Symbol->Section->Number;
@@ -929,7 +934,7 @@ void WinCOFFObjectWriter::WriteObject(MC
       bool RelocationsOverflow = Sec->Relocations.size() >= 0xffff;
 
       if (RelocationsOverflow) {
-        // Signal overflow by setting NumberOfSections to max value. Actual
+        // Signal overflow by setting NumberOfRelocations to max value. Actual
         // size is found in reloc #0. Microsoft tools understand this.
         Sec->Header.NumberOfRelocations = 0xffff;
       } else {