Index: tools/llvm-objdump/MachODump.cpp
===================================================================
--- tools/llvm-objdump/MachODump.cpp
+++ tools/llvm-objdump/MachODump.cpp
@@ -4636,10 +4636,12 @@
     outs() << " " << name;
   outs() << "\n";
 
-  name =
-      get_symbol_32(offset + offsetof(struct class32_t, data), S, info, c.data);
   outs() << "          data " << format("0x%" PRIx32, c.data)
          << " (struct class_ro_t *)";
+  name =
+      get_symbol_32(offset + offsetof(struct class32_t, data), S, info, c.data);
+  if (name != nullptr)
+    outs() << " " << name;
 
   // This is a Swift class if some of the low bits of the pointer are set.
   if (c.data & 0x3)
@@ -8602,7 +8604,6 @@
         if (NeedsComma)
           outs() << ", ";
         outs() << format("resolver=0x%08llX", Entry.other());
-        NeedsComma = true;
       }
       outs() << "]";
     }