1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 19:23:23 +01:00

Reapply 68073, with fixes. EH Landing-pad basic blocks are not

entered via fall-through. Don't miss fallthroughs from blocks
terminated by conditional branches. Also, move
isOnlyReachableByFallthrough out of line.

llvm-svn: 68129
This commit is contained in:
Dan Gohman 2009-03-31 18:39:13 +00:00
parent 98603f97fa
commit 86e4d0130c
3 changed files with 19 additions and 1 deletions

View File

@ -253,6 +253,11 @@ public:
/// it returns end()
iterator getFirstTerminator();
/// isOnlyReachableViaFallthough - Return true if this basic block has
/// exactly one predecessor and the control transfer mechanism between
/// the predecessor and this block is a fall-through.
bool isOnlyReachableByFallthrough() const;
void pop_front() { Insts.pop_front(); }
void pop_back() { Insts.pop_back(); }
void push_back(MachineInstr *MI) { Insts.push_back(MI); }

View File

@ -123,6 +123,16 @@ MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() {
return I;
}
bool
MachineBasicBlock::isOnlyReachableByFallthrough() const {
return !isLandingPad() &&
!pred_empty() &&
next(pred_begin()) == pred_end() &&
(*pred_begin())->isLayoutSuccessor(this) &&
((*pred_begin())->empty() ||
!(*pred_begin())->back().getDesc().isBarrier());
}
void MachineBasicBlock::dump() const {
print(*cerr.stream());
}

View File

@ -238,7 +238,10 @@ bool X86ATTAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
for (MachineFunction::const_iterator I = MF.begin(), E = MF.end();
I != E; ++I) {
// Print a label for the basic block.
if (!I->pred_empty()) {
if (!VerboseAsm && (I->pred_empty() || I->isOnlyReachableByFallthrough())) {
// This is an entry block or a block that's only reachable via a
// fallthrough edge. In non-VerboseAsm mode, don't print the label.
} else {
printBasicBlockLabel(I, true, true, VerboseAsm);
O << '\n';
}