Skip to content

Commit

Permalink
Fix merge fallout
Browse files Browse the repository at this point in the history
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123172 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
asl committed Jan 10, 2011
1 parent 7af6fad commit 2c8bd75
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/Target/MBlaze/MBlazeFrameLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2c8bd75

Please sign in to comment.