mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-10-10 16:24:04 +00:00
Invalidate debug/eh/gc labels when unreachable MBB is deleted.
Based on patch by Martin Nowack! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58536 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
2583b2a713
commit
ed532cac7c
@ -27,6 +27,7 @@
|
|||||||
#include "llvm/Pass.h"
|
#include "llvm/Pass.h"
|
||||||
#include "llvm/Type.h"
|
#include "llvm/Type.h"
|
||||||
#include "llvm/CodeGen/MachineFunctionPass.h"
|
#include "llvm/CodeGen/MachineFunctionPass.h"
|
||||||
|
#include "llvm/CodeGen/MachineModuleInfo.h"
|
||||||
#include "llvm/CodeGen/MachineRegisterInfo.h"
|
#include "llvm/CodeGen/MachineRegisterInfo.h"
|
||||||
#include "llvm/Support/CFG.h"
|
#include "llvm/Support/CFG.h"
|
||||||
#include "llvm/Support/Compiler.h"
|
#include "llvm/Support/Compiler.h"
|
||||||
@ -87,7 +88,7 @@ namespace {
|
|||||||
class VISIBILITY_HIDDEN UnreachableMachineBlockElim :
|
class VISIBILITY_HIDDEN UnreachableMachineBlockElim :
|
||||||
public MachineFunctionPass {
|
public MachineFunctionPass {
|
||||||
virtual bool runOnMachineFunction(MachineFunction &F);
|
virtual bool runOnMachineFunction(MachineFunction &F);
|
||||||
|
MachineModuleInfo *MMI;
|
||||||
public:
|
public:
|
||||||
static char ID; // Pass identification, replacement for typeid
|
static char ID; // Pass identification, replacement for typeid
|
||||||
UnreachableMachineBlockElim() : MachineFunctionPass(&ID) {}
|
UnreachableMachineBlockElim() : MachineFunctionPass(&ID) {}
|
||||||
@ -104,6 +105,8 @@ const PassInfo *const llvm::UnreachableMachineBlockElimID = &Y;
|
|||||||
bool UnreachableMachineBlockElim::runOnMachineFunction(MachineFunction &F) {
|
bool UnreachableMachineBlockElim::runOnMachineFunction(MachineFunction &F) {
|
||||||
SmallPtrSet<MachineBasicBlock*, 8> Reachable;
|
SmallPtrSet<MachineBasicBlock*, 8> Reachable;
|
||||||
|
|
||||||
|
MMI = getAnalysisToUpdate<MachineModuleInfo>();
|
||||||
|
|
||||||
// Mark all reachable blocks.
|
// Mark all reachable blocks.
|
||||||
for (df_ext_iterator<MachineFunction*, SmallPtrSet<MachineBasicBlock*, 8> >
|
for (df_ext_iterator<MachineFunction*, SmallPtrSet<MachineBasicBlock*, 8> >
|
||||||
I = df_ext_begin(&F, Reachable), E = df_ext_end(&F, Reachable);
|
I = df_ext_begin(&F, Reachable), E = df_ext_end(&F, Reachable);
|
||||||
@ -142,8 +145,20 @@ bool UnreachableMachineBlockElim::runOnMachineFunction(MachineFunction &F) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Actually remove the blocks now.
|
// Actually remove the blocks now.
|
||||||
for (unsigned i = 0, e = DeadBlocks.size(); i != e; ++i)
|
for (unsigned i = 0, e = DeadBlocks.size(); i != e; ++i) {
|
||||||
DeadBlocks[i]->eraseFromParent();
|
MachineBasicBlock *MBB = DeadBlocks[i];
|
||||||
|
// If there are any labels in the basic block, unregister them from
|
||||||
|
// MachineModuleInfo.
|
||||||
|
if (MMI && !MBB->empty()) {
|
||||||
|
for (MachineBasicBlock::iterator I = MBB->begin(),
|
||||||
|
E = MBB->end(); I != E; ++I) {
|
||||||
|
if (I->isLabel())
|
||||||
|
// The label ID # is always operand #0, an immediate.
|
||||||
|
MMI->InvalidateLabel(I->getOperand(0).getImm());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
MBB->eraseFromParent();
|
||||||
|
}
|
||||||
|
|
||||||
// Cleanup PHI nodes.
|
// Cleanup PHI nodes.
|
||||||
for (MachineFunction::iterator I = F.begin(), E = F.end(); I != E; ++I) {
|
for (MachineFunction::iterator I = F.begin(), E = F.end(); I != E; ++I) {
|
||||||
@ -182,4 +197,3 @@ bool UnreachableMachineBlockElim::runOnMachineFunction(MachineFunction &F) {
|
|||||||
|
|
||||||
return DeadBlocks.size();
|
return DeadBlocks.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user