Yep, looks good once we test this. ================ Comment at: lib/DebugInfo/DWARFDebugInfoEntry.cpp:87 @@ +86,3 @@ + break; + OS << ", "; + } while (true); ---------------- This would output an extra trailing comma http://reviews.llvm.org/D5689