Revert accidentally landed patch citing o build errors

Summary: This reverts commit c73966c2f79290e4eefe6e481f7bc94dd6ca4437.

Reviewers:

Subscribers:

diff --git a/llvm/include/llvm/CodeGen/MachineFrameInfo.h b/llvm/include/llvm/CodeGen/MachineFrameInfo.h
index cfda92b..c5e57e6 100644 (file)
--- a/llvm/include/llvm/CodeGen/MachineFrameInfo.h
+++ b/llvm/include/llvm/CodeGen/MachineFrameInfo.h
@@ -821,7 +821,7 @@ public:
   BitVector getPristineRegs(const MachineFunction &MF) const;
 
   /// Used by the MachineFunction printer to print information about
-  /// stack objects.
+  /// stack objects. Implemented in MachineFunction.cpp.
   void print(const MachineFunction &MF, raw_ostream &OS) const;
 
   /// dump - Print the function to stderr.

diff --git a/llvm/lib/CodeGen/MachineFrameInfo.cpp b/llvm/lib/CodeGen/MachineFrameInfo.cpp
index a0e706b..7ba27ff 100644 (file)
--- a/llvm/lib/CodeGen/MachineFrameInfo.cpp
+++ b/llvm/lib/CodeGen/MachineFrameInfo.cpp
@@ -210,16 +210,11 @@ void MachineFrameInfo::computeMaxCallFrameSize(const MachineFunction &MF) {
 }
 
 void MachineFrameInfo::print(const MachineFunction &MF, raw_ostream &OS) const{
-  OS << "MF name: " << MF.getName() << "\n";
-  if (Objects.empty()) {
-    OS << "No stack objects.\n";
-    return;
-  }
+  if (Objects.empty()) return;
+
   const TargetFrameLowering *FI = MF.getSubtarget().getFrameLowering();
   int ValOffset = (FI ? FI->getOffsetOfLocalArea() : 0);
 
-  OS << "NumFixedObjects=" << static_cast<unsigned>(NumFixedObjects) << "\n";
-
   OS << "Frame Objects:\n";
 
   for (unsigned i = 0, e = Objects.size(); i != e; ++i) {
@@ -227,13 +222,12 @@ void MachineFrameInfo::print(const MachineFunction &MF, raw_ostream &OS) const{
     OS << "  fi#" << (int)(i-NumFixedObjects) << ": ";
 
     if (SO.StackID != 0)
-      OS << "stackid=" << static_cast<unsigned>(SO.StackID) << ", ";
+      OS << "id=" << static_cast<unsigned>(SO.StackID) << ' ';
 
     if (SO.Size == ~0ULL) {
       OS << "dead\n";
       continue;
     }
-    OS << "isSplitSplot=" << static_cast<bool>(SO.isSpillSlot) << ", ";
     if (SO.Size == 0)
       OS << "variable sized";
     else
@@ -241,7 +235,7 @@ void MachineFrameInfo::print(const MachineFunction &MF, raw_ostream &OS) const{
     OS << ", align=" << SO.Alignment.value();
 
     if (i < NumFixedObjects)
-      OS << ", fixed objects:";
+      OS << ", fixed";
     if (i < NumFixedObjects || SO.SPOffset != -1) {
       int64_t Off = SO.SPOffset - ValOffset;
       OS << ", at location [SP";