diff options
| -rw-r--r-- | include/llvm/CodeGen/MachineInstr.h | 2 | ||||
| -rw-r--r-- | lib/CodeGen/MachineInstr.cpp | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h index 3c7611f6a8..3d2c61761c 100644 --- a/include/llvm/CodeGen/MachineInstr.h +++ b/include/llvm/CodeGen/MachineInstr.h @@ -314,7 +314,7 @@ public: /// instruction bundles. bool hasProperty(unsigned MCFlag, QueryType Type = AnyInBundle) const { // Inline the fast path. - if (Type == IgnoreBundle || !isBundle()) + if (Type == IgnoreBundle || !isBundled()) return getDesc().getFlags() & (1 << MCFlag); // If we have a bundle, take the slow path. diff --git a/lib/CodeGen/MachineInstr.cpp b/lib/CodeGen/MachineInstr.cpp index 92f6a7f769..cdf46b631f 100644 --- a/lib/CodeGen/MachineInstr.cpp +++ b/lib/CodeGen/MachineInstr.cpp @@ -752,20 +752,18 @@ void MachineInstr::addMemOperand(MachineFunction &MF, } bool MachineInstr::hasPropertyInBundle(unsigned Mask, QueryType Type) const { - const MachineBasicBlock *MBB = getParent(); - MachineBasicBlock::const_instr_iterator MII = *this; ++MII; - while (MII != MBB->end() && MII->isInsideBundle()) { + for (MachineBasicBlock::const_instr_iterator MII = this;; ++MII) { if (MII->getDesc().getFlags() & Mask) { if (Type == AnyInBundle) return true; } else { - if (Type == AllInBundle) + if (Type == AllInBundle && !MII->isBundle()) return false; } - ++MII; + // This was the last instruction in the bundle. + if (!MII->isBundledWithSucc()) + return Type == AllInBundle; } - - return Type == AllInBundle; } bool MachineInstr::isIdenticalTo(const MachineInstr *Other, |