diff --git a/lib/DebugInfo/DWARFContext.cpp b/lib/DebugInfo/DWARFContext.cpp
index 4e3b4b67e33..f8234e93c58 100644
--- a/lib/DebugInfo/DWARFContext.cpp
+++ b/lib/DebugInfo/DWARFContext.cpp
@@ -40,22 +40,20 @@ static void dumpPubSection(raw_ostream &OS, StringRef Name, StringRef Data,
   if (GnuStyle)
     OS << "Offset     Linkage  Kind     Name\n";
   else
-    OS << "Offset        Name\n";
+    OS << "Offset     Name\n";
 
   while (offset < Data.size()) {
     uint32_t dieRef = pubNames.getU32(&offset);
     if (dieRef == 0)
       break;
+    OS << format("0x%8.8x ", dieRef);
     if (GnuStyle) {
       PubIndexEntryDescriptor desc(pubNames.getU8(&offset));
-      OS << format("0x%8.8x ", dieRef)
-         << format("%-8s", dwarf::GDBIndexEntryLinkageString(desc.Linkage))
+      OS << format("%-8s", dwarf::GDBIndexEntryLinkageString(desc.Linkage))
          << ' ' << format("%-8s", dwarf::GDBIndexEntryKindString(desc.Kind))
-         << ' ' << '\"' << pubNames.getCStr(&offset) << "\"\n";
-    } else {
-      OS << format("0x%8.8x    ", dieRef);
-      OS << '\"' << pubNames.getCStr(&offset) << "\"\n";
+         << ' ';
     }
+    OS << '\"' << pubNames.getCStr(&offset) << "\"\n";
   }
 }