From 2c8bd754ded25cb5b33f48a794014e452bcdf59f Mon Sep 17 00:00:00 2001 From: Anton Korobeynikov Date: Mon, 10 Jan 2011 12:56:18 +0000 Subject: [PATCH] Fix merge fallout git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123172 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/MBlaze/MBlazeFrameLowering.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Target/MBlaze/MBlazeFrameLowering.cpp b/lib/Target/MBlaze/MBlazeFrameLowering.cpp index 9cd8d9d145f..e501621154d 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(); 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