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

Mark all calls as "could throw", when exceptions are enabled. Emit necessary LP info too. This fixes PR1439 

llvm-svn: 37311
This commit is contained in:
Anton Korobeynikov 2007-05-23 11:08:31 +00:00
parent 6509c0673f
commit 3b327826db
4 changed files with 51 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/include/llvm/CodeGen/MachineModuleInfo.h
View File

@ -967,6 +967,7 @@ struct LandingPadInfo {
LandingPadInfo(MachineBasicBlock *MBB)
: LandingPadBlock(MBB)
, LandingPadLabel(0)
, Personality(NULL)
, TypeIds()
, IsFilter(false)
{}

2
llvm/lib/CodeGen/DwarfWriter.cpp
View File

@ -2852,7 +2852,7 @@ private:
EmitLabel("eh_frame_begin", EHFrameInfo.Number);
EmitSectionOffset("eh_frame_begin", "section_eh_frame",
EmitSectionOffset("eh_frame_begin", "eh_frame_common",
EHFrameInfo.Number, EHFrameInfo.PersonalityIndex,
true, true);
Asm->EOL("FDE CIE offset");

16
llvm/lib/CodeGen/MachineModuleInfo.cpp
View File

@ -1723,7 +1723,9 @@ void MachineModuleInfo::TidyLandingPads() {
LandingPadInfo &LandingPad = LandingPads[i];
LandingPad.LandingPadLabel = MappedLabel(LandingPad.LandingPadLabel);
if (!LandingPad.LandingPadLabel) {
// Special case: we *should* emit LPs with null LP MBB. This indicates
// "rethrow" case.
if (!LandingPad.LandingPadLabel && LandingPad.LandingPadBlock) {
LandingPads.erase(LandingPads.begin() + i);
continue;
}
@ -1768,9 +1770,15 @@ Function *MachineModuleInfo::getPersonality() const {
/// getPersonalityIndex - Return unique index for current personality
/// function. NULL personality function should always get zero index.
unsigned MachineModuleInfo::getPersonalityIndex() const {
const Function* Personality = (!LandingPads.empty() ?
LandingPads[0].Personality : NULL);
const Function* Personality = NULL;
// Scan landing pads. If there is at least one non-NULL personality - use it.
for (unsigned i = 0; i != LandingPads.size(); ++i)
if (LandingPads[i].Personality) {
Personality = LandingPads[i].Personality;
break;
}
for (unsigned i = 0; i < Personalities.size(); ++i) {
if (Personalities[i] == Personality)
return i;

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

@ -529,8 +529,9 @@ public:
void ExportFromCurrentBlock(Value *V);
void LowerCallTo(Instruction &I,
const Type *CalledValueTy, unsigned CallingConv,
bool IsTailCall, SDOperand Callee, unsigned OpIdx);
bool IsTailCall, SDOperand Callee, unsigned OpIdx,
MachineBasicBlock *LandingPad = NULL);
// Terminator instructions.
void visitRet(ReturnInst &I);
void visitBr(BranchInst &I);
@ -1341,31 +1342,13 @@ void SelectionDAGLowering::visitInvoke(InvokeInst &I, bool AsTerminator) {
if (!AsTerminator) {
// 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
// MachineModuleInfo.
MachineModuleInfo *MMI = DAG.getMachineModuleInfo();
unsigned BeginLabel = MMI->NextLabelID();
DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other, getRoot(),
DAG.getConstant(BeginLabel, MVT::i32)));
LowerCallTo(I, I.getCalledValue()->getType(),
I.getCallingConv(),
false,
getValue(I.getOperand(0)),
3);
I.getCallingConv(),
false,
getValue(I.getOperand(0)),
3, LandingPad);
// Insert a label before the invoke call to mark the try range.
// This can be used to detect deletion of the invoke via the
// MachineModuleInfo.
unsigned EndLabel = MMI->NextLabelID();
DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other, getRoot(),
DAG.getConstant(EndLabel, MVT::i32)));
// Inform MachineModuleInfo of range.
MMI->addInvoke(LandingPad, BeginLabel, EndLabel);
// Update successor info
CurMBB->addSuccessor(Return);
CurMBB->addSuccessor(LandingPad);
@ -2782,11 +2765,14 @@ void SelectionDAGLowering::LowerCallTo(Instruction &I,
const Type *CalledValueTy,
unsigned CallingConv,
bool IsTailCall,
SDOperand Callee, unsigned OpIdx) {
SDOperand Callee, unsigned OpIdx,
MachineBasicBlock *LandingPad) {
const PointerType *PT = cast<PointerType>(CalledValueTy);
const FunctionType *FTy = cast<FunctionType>(PT->getElementType());
const ParamAttrsList *Attrs = FTy->getParamAttrs();
MachineModuleInfo *MMI = DAG.getMachineModuleInfo();
unsigned BeginLabel = 0, EndLabel = 0;
TargetLowering::ArgListTy Args;
TargetLowering::ArgListEntry Entry;
Args.reserve(I.getNumOperands());
@ -2803,6 +2789,14 @@ void SelectionDAGLowering::LowerCallTo(Instruction &I,
Args.push_back(Entry);
}
if (ExceptionHandling) {
// Insert a label before the invoke call to mark the try range. This can be
// used to detect deletion of the invoke via the MachineModuleInfo.
BeginLabel = MMI->NextLabelID();
DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other, getRoot(),
DAG.getConstant(BeginLabel, MVT::i32)));
}
std::pair<SDOperand,SDOperand> Result =
TLI.LowerCallTo(getRoot(), I.getType(),
Attrs && Attrs->paramHasAttr(0, ParamAttr::SExt),
@ -2811,6 +2805,17 @@ void SelectionDAGLowering::LowerCallTo(Instruction &I,
if (I.getType() != Type::VoidTy)
setValue(&I, Result.first);
DAG.setRoot(Result.second);
if (ExceptionHandling) {
// Insert a label at the end of the invoke call to mark the try range. This
// can be used to detect deletion of the invoke via the MachineModuleInfo.
EndLabel = MMI->NextLabelID();
DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other, getRoot(),
DAG.getConstant(EndLabel, MVT::i32)));
// Inform MachineModuleInfo of range.
MMI->addInvoke(LandingPad, BeginLabel, EndLabel);
}
}
@ -2871,12 +2876,12 @@ void SelectionDAGLowering::visitCall(CallInst &I) {
Callee = getValue(I.getOperand(0));
else
Callee = DAG.getExternalSymbol(RenameFn, TLI.getPointerTy());
LowerCallTo(I, I.getCalledValue()->getType(),
I.getCallingConv(),
I.isTailCall(),
Callee,
1);
I.getCallingConv(),
I.isTailCall(),
Callee,
1);
}