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

use ArgOperand accessors 

and CallInst for getting hold
of the intrinsic's arguments

simplify along the way (at least for me this is much more legible now)
Bill, Baldrick or Anton, please review\!

llvm-svn: 106838
This commit is contained in:
Gabor Greif 2010-06-25 11:25:30 +00:00
parent 7dd3afdff3
commit b890fc8023
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
llvm/lib/CodeGen/DwarfEHPrepare.cpp
View File

@ -22,6 +22,7 @@
#include "llvm/Analysis/Dominators.h"
#include "llvm/CodeGen/Passes.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/Support/CallSite.h"
#include "llvm/Target/TargetLowering.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Transforms/Utils/PromoteMemToReg.h"
@ -193,8 +194,8 @@ FunctionPass *llvm::createDwarfEHPass(const TargetMachine *tm, bool fast) {
bool DwarfEHPrepare::HasCatchAllInSelector(IntrinsicInst *II) {
if (!EHCatchAllValue) return false;
unsigned OpIdx = II->getNumOperands() - 1;
GlobalVariable *GV = dyn_cast<GlobalVariable>(II->getOperand(OpIdx));
unsigned ArgIdx = II->getNumArgOperands() - 1;
GlobalVariable *GV = dyn_cast<GlobalVariable>(II->getArgOperand(ArgIdx));
return GV == EHCatchAllValue;
}
@ -386,16 +387,20 @@ bool DwarfEHPrepare::HandleURoRInvokes() {
// Use the exception object pointer and the personality function
// from the original selector.
Args.push_back(II->getArgOperand(0)); // Exception object pointer.
Args.push_back(II->getArgOperand(1)); // Personality function.
CallSite CS(II);
IntrinsicInst::op_iterator I = CS.arg_begin();
Args.push_back(*I++); // Exception object pointer.
Args.push_back(*I++); // Personality function.
unsigned I = 3;
unsigned E = II->getNumOperands() -
(isa<ConstantInt>(II->getOperand(II->getNumOperands() - 1)) ? 1 : 0);
IntrinsicInst::op_iterator E = CS.arg_end();
IntrinsicInst::op_iterator B = prior(E);
// Exclude last argument if it is an integer.
if (isa<ConstantInt>(B)) E = B;
// Add in any filter IDs.
for (; I < E; ++I)
Args.push_back(II->getOperand(I));
for (; I != E; ++I)
Args.push_back(*I);
Args.push_back(EHCatchAllValue->getInitializer()); // Catch-all indicator.