summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAkira Hatanaka <ahatanaka@mips.com>2012-10-26 17:11:42 +0000
committerAkira Hatanaka <ahatanaka@mips.com>2012-10-26 17:11:42 +0000
commitaf8082206beb2a9ddaa7380e735d1ae1c221bce6 (patch)
tree4b0fd3720849ee8e028c2b443f95ffd150771efc /lib
parenteac3b65b00883ff8edaf0fbc4b973d5a3a9c455d (diff)
downloadllvm-af8082206beb2a9ddaa7380e735d1ae1c221bce6.tar.gz
llvm-af8082206beb2a9ddaa7380e735d1ae1c221bce6.tar.bz2
llvm-af8082206beb2a9ddaa7380e735d1ae1c221bce6.tar.xz
Make sure I is not the end iterator when isInsideBundle is called.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166784 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/CodeGen/MachineBasicBlock.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/CodeGen/MachineBasicBlock.cpp b/lib/CodeGen/MachineBasicBlock.cpp
index 6ade6a85e5..18d021d521 100644
--- a/lib/CodeGen/MachineBasicBlock.cpp
+++ b/lib/CodeGen/MachineBasicBlock.cpp
@@ -145,7 +145,8 @@ MachineBasicBlock::iterator MachineBasicBlock::getFirstNonPHI() {
instr_iterator I = instr_begin(), E = instr_end();
while (I != E && I->isPHI())
++I;
- assert(!I->isInsideBundle() && "First non-phi MI cannot be inside a bundle!");
+ assert((I == E || !I->isInsideBundle()) &&
+ "First non-phi MI cannot be inside a bundle!");
return I;
}
@@ -156,7 +157,7 @@ MachineBasicBlock::SkipPHIsAndLabels(MachineBasicBlock::iterator I) {
++I;
// FIXME: This needs to change if we wish to bundle labels / dbg_values
// inside the bundle.
- assert(!I->isInsideBundle() &&
+ assert((I == E || !I->isInsideBundle()) &&
"First non-phi / non-label instruction is inside a bundle!");
return I;
}