diff options
| author | Anton Korobeynikov <asl@math.spbu.ru> | 2011-01-10 12:56:18 +0000 |
|---|---|---|
| committer | Anton Korobeynikov <asl@math.spbu.ru> | 2011-01-10 12:56:18 +0000 |
| commit | 2c8bd754ded25cb5b33f48a794014e452bcdf59f (patch) | |
| tree | f41625e9d37d0df5a4525d25329fb514bc3ad3ee | |
| parent | 7af6fad0a73f33a6782166676d48073ce8565c47 (diff) | |
Fix merge fallout
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123172 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/MBlaze/MBlazeFrameLowering.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/MBlaze/MBlazeFrameLowering.cpp b/lib/Target/MBlaze/MBlazeFrameLowering.cpp index 9cd8d9d145..e501621154 100644 --- 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 |