2 files changed, 8 insertions, 8 deletions
diff --git a/include/llvm/CodeGen/MachineFrameInfo.h b/include/llvm/CodeGen/MachineFrameInfo.h
index fc8394297d..6d640a6b5a 100644
--- a/include/llvm/CodeGen/MachineFrameInfo.h
+++ b/include/llvm/CodeGen/MachineFrameInfo.h
@@ -1,6 +1,6 @@
-//===-- CodeGen/FunctionFrameInfo.h - Abstract Stack Frame Rep --*- C++ -*-===//
+//===-- CodeGen/MachineFrameInfo.h - Abstract Stack Frame Rep. --*- C++ -*-===//
 // 
-// The FunctionFrameInfo class represents an abstract stack frame until
+// The MachineFrameInfo class represents an abstract stack frame until
 // prolog/epilog code is inserted.  This class is key to allowing stack frame
 // representation optimizations, such as frame pointer elimination.  It also
 // allows more mundane (but still important) optimizations, such as reordering
@@ -31,7 +31,7 @@
 #ifndef LLVM_CODEGEN_FUNCTIONFRAMEINFO_H
 #define LLVM_CODEGEN_FUNCTIONFRAMEINFO_H
 
-class FunctionFrameInfo {
+class MachineFrameInfo {
 
   // StackObject - Represent a single object allocated on the stack.
   struct StackObject {
@@ -83,7 +83,7 @@ class FunctionFrameInfo {
   ///
   unsigned MaxCallFrameSize;
 public:
-  FunctionFrameInfo() {
+  MachineFrameInfo() {
     NumFixedObjects = StackSize = 0;
     HasVarSizedObjects = false;
     HasCalls = false;
@@ -181,7 +181,7 @@ public:
     return Objects.size()-NumFixedObjects-1;
   }
 
-  /// CreateVariableSizedObject - Notify the FunctionFrameInfo object that a
+  /// CreateVariableSizedObject - Notify the MachineFrameInfo object that a
   /// variable sized object has been created.  This must be created whenever a
   /// variable sized object is created, whether or not the index returned is
   /// actually used.
diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h
index 58b4a9edf4..602307ea9d 100644
--- a/include/llvm/CodeGen/MachineFunction.h
+++ b/include/llvm/CodeGen/MachineFunction.h
@@ -20,7 +20,7 @@ class TargetMachine;
 class Pass;
 class SSARegMap;
 class MachineFunctionInfo;
-class FunctionFrameInfo;
+class MachineFrameInfo;
 
 Pass *createMachineCodeConstructionPass(TargetMachine &Target);
 Pass *createMachineCodeDestructionPass();
@@ -40,7 +40,7 @@ class MachineFunction : private Annotation {
   MachineFunctionInfo *MFInfo;
 
   // Keep track of objects allocated on the stack.
-  FunctionFrameInfo *FrameInfo;
+  MachineFrameInfo *FrameInfo;
 
 public:
   MachineFunction(const Function *Fn, const TargetMachine& target);
@@ -64,7 +64,7 @@ public:
   /// This object contains information about objects allocated on the stack
   /// frame of the current function in an abstract way.
   ///
-  FunctionFrameInfo *getFrameInfo() const { return FrameInfo; }
+  MachineFrameInfo *getFrameInfo() const { return FrameInfo; }
 
   /// MachineFunctionInfo - Keep track of various per-function pieces of
   /// information for the sparc backend.