Fix merge fallout

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123172 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/MBlaze/MBlazeFrameLowering.cpp b/lib/Target/MBlaze/MBlazeFrameLowering.cpp
index 9cd8d9d145f9824bdd8c6f6e99bdbfc3a061aca3..e501621154d9af50cbb70c76fa5ab16970e35676 100644 (file)
--- a/lib/Target/MBlaze/MBlazeFrameLowering.cpp
+++ b/lib/Target/MBlaze/MBlazeFrameLowering.cpp
@@ -323,12 +323,12 @@ static void determineFrameLayout(MachineFunction &MF) {
   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