commit 5fb942a307b7a4a7b44509c9e24435bfeba61d71
author Anton Korobeynikov <asl@math.spbu.ru> Mon Jan 10 12:56:18 2011 +0000
committer Anton Korobeynikov <asl@math.spbu.ru> Mon Jan 10 12:56:18 2011 +0000
tree 61d6f6a58c8e25ac2918f2556526cc4be49efb2b
parent 441ae5b88cf4a49083d4784b2ccadd1bbd3bf3b9

Fix merge fallout

llvm-svn: 123172

llvm/lib/Target/MBlaze/MBlazeFrameLowering.cpp

diff --git a/llvm/lib/Target/MBlaze/MBlazeFrameLowering.cpp b/llvm/lib/Target/MBlaze/MBlazeFrameLowering.cpp
index 9cd8d9d..e501621 100644
--- a/llvm/lib/Target/MBlaze/MBlazeFrameLowering.cpp
+++ b/llvm/lib/Target/MBlaze/MBlazeFrameLowering.cpp
@@ -323,12 +323,12 @@
   DEBUG(dbgs() << "Aligned Frame Size: " << FrameSize << "\n" );
 }
 
-int MBlazeFrameInfo::getFrameIndexOffset(const MachineFunction &MF, int FI) 
+int MBlazeFrameLowering::getFrameIndexOffset(const MachineFunction &MF, int FI) 
   const {
   const MBlazeFunctionInfo *MBlazeFI = MF.getInfo<MBlazeFunctionInfo>();
   if (MBlazeFI->hasReplacement(FI))
     FI = MBlazeFI->getReplacement(FI);
-  return TargetFrameInfo::getFrameIndexOffset(MF,FI);
+  return TargetFrameLowering::getFrameIndexOffset(MF,FI);
 }
 
 // hasFP - Return true if the specified function should have a dedicated frame