From b62fbc5e469f532fd1747a3c24115fb1d0ba792f Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Tue, 28 Feb 2012 23:52:31 +0000 Subject: Instructions inside a bundle have the same number as the bundle itself. SlotIndexes are not assigned to instructions inside bundles, but it is still valid to look up the index of those instructions. The reverse getInstructionFromIndex() will return the first instruction in the bundle. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151672 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/SlotIndexes.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include/llvm/CodeGen/SlotIndexes.h') diff --git a/include/llvm/CodeGen/SlotIndexes.h b/include/llvm/CodeGen/SlotIndexes.h index 05daddbcff..6c09526b59 100644 --- a/include/llvm/CodeGen/SlotIndexes.h +++ b/include/llvm/CodeGen/SlotIndexes.h @@ -493,8 +493,12 @@ namespace llvm { } /// Returns the base index for the given instruction. - SlotIndex getInstructionIndex(const MachineInstr *instr) const { - Mi2IndexMap::const_iterator itr = mi2iMap.find(instr); + SlotIndex getInstructionIndex(const MachineInstr *MI) const { + // Instructions inside a bundle have the same number as the bundle itself. + MachineBasicBlock::const_instr_iterator I = MI; + while (I->isInsideBundle()) + --I; + Mi2IndexMap::const_iterator itr = mi2iMap.find(I); assert(itr != mi2iMap.end() && "Instruction not found in maps."); return itr->second; } -- cgit v1.2.3