[llvm-commits] [llvm] r123172 - /llvm/trunk/lib/Target/MBlaze/MBlazeFrameLowering.cpp

[Anton Korobeynikov]

Author: asl
Date: Mon Jan 10 06:56:18 2011
New Revision: 123172

URL: http://llvm.org/viewvc/llvm-project?rev=123172&view=rev
Log:
Fix merge fallout

Modified:
    llvm/trunk/lib/Target/MBlaze/MBlazeFrameLowering.cpp

Modified: llvm/trunk/lib/Target/MBlaze/MBlazeFrameLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MBlaze/MBlazeFrameLowering.cpp?rev=123172&r1=123171&r2=123172&view=diff
==============================================================================
--- llvm/trunk/lib/Target/MBlaze/MBlazeFrameLowering.cpp (original)
+++ llvm/trunk/lib/Target/MBlaze/MBlazeFrameLowering.cpp Mon Jan 10 06:56:18 2011
@@ -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