diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index a7c63ef4c85..a4c4ea4bb95 100644
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -57,16 +57,21 @@ void MachineFunctionInitializer::anchor() {}
 void MachineFunctionProperties::print(raw_ostream &ROS, bool OnlySet) const {
   // Leave this function even in NDEBUG as an out-of-line anchor.
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
+  bool NeedsComma = false;
   for (BitVector::size_type i = 0; i < Properties.size(); ++i) {
     bool HasProperty = Properties[i];
     if (OnlySet && !HasProperty)
       continue;
+    if (NeedsComma)
+      ROS << ", ";
+    else
+      NeedsComma = true;
     switch(static_cast<Property>(i)) {
       case Property::IsSSA:
-        ROS << (HasProperty ? "SSA, " : "Post SSA, ");
+        ROS << (HasProperty ? "SSA" : "Post SSA");
         break;
       case Property::TracksLiveness:
-        ROS << (HasProperty ? "" : "not ") << "tracking liveness, ";
+        ROS << (HasProperty ? "" : "not ") << "tracking liveness";
         break;
       case Property::AllVRegsAllocated:
         ROS << (HasProperty ? "AllVRegsAllocated" : "HasVRegs");