diff options
| -rw-r--r-- | include/llvm/Target/MRegisterInfo.h | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86RegisterInfo.cpp | 7 | ||||
| -rw-r--r-- | lib/Target/X86/X86RegisterInfo.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/include/llvm/Target/MRegisterInfo.h b/include/llvm/Target/MRegisterInfo.h index b8fc17d23e..e54a354f13 100644 --- a/include/llvm/Target/MRegisterInfo.h +++ b/include/llvm/Target/MRegisterInfo.h @@ -259,7 +259,7 @@ public: /// is returned with the specified operand folded, otherwise NULL is /// returned. The client is responsible for removing the old /// instruction and adding the new one in the instruction stream - virtual MachineInstr* foldMemoryOperand(MachineBasicBlock::iterator MI, + virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, int FrameIndex) const { return NULL; diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp index 211cd6e6c8..b904c344b2 100644 --- a/lib/Target/X86/X86RegisterInfo.cpp +++ b/lib/Target/X86/X86RegisterInfo.cpp @@ -132,10 +132,9 @@ static MachineInstr *MakeRMIInst(unsigned Opcode, unsigned FrameIndex, } -MachineInstr* X86RegisterInfo::foldMemoryOperand( - MachineBasicBlock::iterator MI, - unsigned i, - int FrameIndex) const { +MachineInstr* X86RegisterInfo::foldMemoryOperand(MachineInstr* MI, + unsigned i, + int FrameIndex) const { if (NoFusing) return NULL; /// FIXME: This should obviously be autogenerated by tablegen when patterns diff --git a/lib/Target/X86/X86RegisterInfo.h b/lib/Target/X86/X86RegisterInfo.h index 3fd6ebec50..b67091cd40 100644 --- a/lib/Target/X86/X86RegisterInfo.h +++ b/lib/Target/X86/X86RegisterInfo.h @@ -48,7 +48,7 @@ struct X86RegisterInfo : public X86GenRegisterInfo { /// folding and return true, otherwise it should return false. If it folds /// the instruction, it is likely that the MachineInstruction the iterator /// references has been changed. - virtual MachineInstr* foldMemoryOperand(MachineBasicBlock::iterator MI, + virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum, int FrameIndex) const; |