From 69244300b8a0112efb44b6273ecea4ca6264b8cf Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 7 Jan 2008 01:56:04 +0000 Subject: Rename MachineInstr::getInstrDescriptor -> getDesc(), which reflects that it is cheap and efficient to get. Move a variety of predicates from TargetInstrInfo into TargetInstrDescriptor, which makes it much easier to query a predicate when you don't have TII around. Now you can use MI->getDesc()->isBranch() instead of going through TII, and this is much more efficient anyway. Not all of the predicates have been moved over yet. Update old code that used MI->getInstrDescriptor()->Flags to use the new predicates in many places. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45674 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/MachineBasicBlock.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/CodeGen/MachineBasicBlock.cpp') diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp index 7f93185375..d2dcd382ed 100644 --- a/lib/CodeGen/MachineBasicBlock.cpp +++ b/lib/CodeGen/MachineBasicBlock.cpp @@ -131,11 +131,10 @@ void ilist_traits::transferNodesFromList( } MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() { - const TargetInstrInfo& TII = *getParent()->getTarget().getInstrInfo(); iterator I = end(); - while (I != begin() && TII.isTerminatorInstr((--I)->getOpcode())) + while (I != begin() && (--I)->getDesc()->isTerminator()) ; /*noop */ - if (I != end() && !TII.isTerminatorInstr(I->getOpcode())) ++I; + if (I != end() && !I->getDesc()->isTerminator()) ++I; return I; } @@ -262,7 +261,7 @@ void MachineBasicBlock::ReplaceUsesOfBlockWith(MachineBasicBlock *Old, MachineBasicBlock::iterator I = end(); while (I != begin()) { --I; - if (!(I->getInstrDescriptor()->Flags & M_TERMINATOR_FLAG)) break; + if (!I->getDesc()->isTerminator()) break; // Scan the operands of this machine instruction, replacing any uses of Old // with New. -- cgit v1.2.3-18-g5258