diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 742a779b6fe..aa10539763f 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -791,9 +791,6 @@ void DwarfDebug::beginModule(Module *M) {
   // Tell MMI that we have debug info.
   MMI->setDebugInfoAvailability(true);
   
-  // Emit initial sections.
-  EmitSectionLabels();
-
   // Prime section data.
   SectionMap.insert(Asm->getObjFileLowering().getTextSection());
 }
@@ -876,6 +873,9 @@ void DwarfDebug::endModule() {
   // Compute DIE offsets and sizes.
   computeSizeAndOffsets();
 
+  // Emit initial sections.
+  EmitSectionLabels();
+
   // Emit all the DIEs into a debug info section
   emitDebugInfo();