diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index a93ebc88ec1..aa3226bbf22 100644
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -266,11 +266,13 @@ void MachineFrameInfo::print(const MachineFunction &MF, std::ostream &OS) const{
 
   for (unsigned i = 0, e = Objects.size(); i != e; ++i) {
     const StackObject &SO = Objects[i];
-    OS << "  <fi #" << (int)(i-NumFixedObjects) << "> is ";
+    OS << "  <fi #" << (int)(i-NumFixedObjects) << ">: ";
     if (SO.Size == 0)
       OS << "variable sized";
     else
-      OS << SO.Size << " byte" << (SO.Size != 1 ? "s" : " ");
+      OS << "size is " << SO.Size << " byte" << (SO.Size != 1 ? "s," : ",");
+    OS << " alignment is " << SO.Alignment << " byte"
+       << (SO.Alignment != 1 ? "s," : ",");
 
     if (i < NumFixedObjects)
       OS << " fixed";