maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix for PR1224. 

llvm-svn: 34610
This commit is contained in:
Jim Laskey 2007-02-25 21:43:59 +00:00
parent 619d4bddc7
commit 14059d958a
1 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
View File

@ -500,6 +500,7 @@ public:
// These all get lowered before this pass. // These all get lowered before this pass.
void visitInvoke(InvokeInst &I); void visitInvoke(InvokeInst &I);
void visitInvoke(InvokeInst &I, bool AsTerminator);
void visitUnwind(UnwindInst &I); void visitUnwind(UnwindInst &I);
void visitScalarBinary(User &I, unsigned OpCode); void visitScalarBinary(User &I, unsigned OpCode);
@ -1102,44 +1103,49 @@ void SelectionDAGLowering::visitJumpTable(SelectionDAGISel::JumpTable &JT) {
} }
void SelectionDAGLowering::visitInvoke(InvokeInst &I) { void SelectionDAGLowering::visitInvoke(InvokeInst &I) {
assert(0 && "Should never be visited directly");
}
void SelectionDAGLowering::visitInvoke(InvokeInst &I, bool AsTerminator) {
// Retrieve successors. // Retrieve successors.
MachineBasicBlock *Return = FuncInfo.MBBMap[I.getSuccessor(0)]; MachineBasicBlock *Return = FuncInfo.MBBMap[I.getSuccessor(0)];
MachineBasicBlock *LandingPad = FuncInfo.MBBMap[I.getSuccessor(1)]; MachineBasicBlock *LandingPad = FuncInfo.MBBMap[I.getSuccessor(1)];
// Mark landing pad so that it doesn't get deleted in branch folding. if (!AsTerminator) {
LandingPad->setIsLandingPad(); // Mark landing pad so that it doesn't get deleted in branch folding.
LandingPad->setIsLandingPad();
// Insert a label before the invoke call to mark the try range.
// This can be used to detect deletion of the invoke via the // Insert a label before the invoke call to mark the try range.
// MachineModuleInfo. // This can be used to detect deletion of the invoke via the
MachineModuleInfo *MMI = DAG.getMachineModuleInfo(); // MachineModuleInfo.
unsigned BeginLabel = MMI->NextLabelID(); MachineModuleInfo *MMI = DAG.getMachineModuleInfo();
DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other, getRoot(), unsigned BeginLabel = MMI->NextLabelID();
DAG.getConstant(BeginLabel, MVT::i32))); DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other, getRoot(),
DAG.getConstant(BeginLabel, MVT::i32)));
LowerCallTo(I, I.getCalledValue()->getType(), LowerCallTo(I, I.getCalledValue()->getType(),
I.getCallingConv(), I.getCallingConv(),
false, false,
getValue(I.getOperand(0)), getValue(I.getOperand(0)),
3); 3);
// Insert a label before the invoke call to mark the try range. // Insert a label before the invoke call to mark the try range.
// This can be used to detect deletion of the invoke via the // This can be used to detect deletion of the invoke via the
// MachineModuleInfo. // MachineModuleInfo.
unsigned EndLabel = MMI->NextLabelID(); unsigned EndLabel = MMI->NextLabelID();
DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other, getRoot(), DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other, getRoot(),
DAG.getConstant(EndLabel, MVT::i32))); DAG.getConstant(EndLabel, MVT::i32)));
// Inform MachineModuleInfo of range. // Inform MachineModuleInfo of range.
MMI->addInvoke(LandingPad, BeginLabel, EndLabel); MMI->addInvoke(LandingPad, BeginLabel, EndLabel);
// Drop into normal successor. // Update successor info
DAG.setRoot(DAG.getNode(ISD::BR, MVT::Other, getRoot(), CurMBB->addSuccessor(Return);
DAG.getBasicBlock(Return))); CurMBB->addSuccessor(LandingPad);
} else {
// Update successor info // Drop into normal successor.
CurMBB->addSuccessor(Return); DAG.setRoot(DAG.getNode(ISD::BR, MVT::Other, getRoot(),
CurMBB->addSuccessor(LandingPad); DAG.getBasicBlock(Return)));
}
} }
void SelectionDAGLowering::visitUnwind(UnwindInst &I) { void SelectionDAGLowering::visitUnwind(UnwindInst &I) {
@ -4216,6 +4222,10 @@ void SelectionDAGISel::BuildSelectionDAG(SelectionDAG &DAG, BasicBlock *LLVMBB,
for (BasicBlock::iterator I = LLVMBB->begin(), E = --LLVMBB->end(); for (BasicBlock::iterator I = LLVMBB->begin(), E = --LLVMBB->end();
I != E; ++I) I != E; ++I)
SDL.visit(*I); SDL.visit(*I);
// Lower call part of invoke.
InvokeInst *Invoke = dyn_cast<InvokeInst>(LLVMBB->getTerminator());
if (Invoke) SDL.visitInvoke(*Invoke, false);
// Ensure that all instructions which are used outside of their defining // Ensure that all instructions which are used outside of their defining
// blocks are available as virtual registers. // blocks are available as virtual registers.
@ -4328,7 +4338,12 @@ void SelectionDAGISel::BuildSelectionDAG(SelectionDAG &DAG, BasicBlock *LLVMBB,
} }
// Lower the terminator after the copies are emitted. // Lower the terminator after the copies are emitted.
SDL.visit(*LLVMBB->getTerminator()); if (Invoke) {
// Just the branch part of invoke.
SDL.visitInvoke(*Invoke, true);
} else {
SDL.visit(*LLVMBB->getTerminator());
}
// Copy over any CaseBlock records that may now exist due to SwitchInst // Copy over any CaseBlock records that may now exist due to SwitchInst
// lowering, as well as any jump table information. // lowering, as well as any jump table information.