diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2011-01-14 06:33:45 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2011-01-14 06:33:45 +0000 |
| commit | ab3d6ecbd2129dadf7095eca827eec206ba5e992 (patch) | |
| tree | 5b8f56d115bc5b039ba8933ba10baa4c51a5c45f /llvm/lib/CodeGen/MachineBasicBlock.cpp | |
| parent | e93e4f118c51f18ce704985020f7cba51a039414 (diff) | |
| download | bcm5719-llvm-ab3d6ecbd2129dadf7095eca827eec206ba5e992.tar.gz bcm5719-llvm-ab3d6ecbd2129dadf7095eca827eec206ba5e992.zip | |
Try for the third time to teach getFirstTerminator() about debug values.
This time let's rephrase to trick gcc-4.3 into not miscompiling.
llvm-svn: 123432
Diffstat (limited to 'llvm/lib/CodeGen/MachineBasicBlock.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/MachineBasicBlock.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp index ad1ab287e34..95b8f86df8d 100644 --- a/llvm/lib/CodeGen/MachineBasicBlock.cpp +++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp @@ -156,9 +156,10 @@ MachineBasicBlock::SkipPHIsAndLabels(MachineBasicBlock::iterator I) { MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() { iterator I = end(); - while (I != begin() && (--I)->getDesc().isTerminator()) + while (I != begin() && ((--I)->getDesc().isTerminator() || I->isDebugValue())) ; /*noop */ - if (I != end() && !I->getDesc().isTerminator()) ++I; + while (I != end() && !I->getDesc().isTerminator()) + ++I; return I; } |
