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

[InstCombine] Change a couple helper functions to only take the IRBuilder as an argument and not the whole InstCombiner object. NFC 

llvm-svn: 307331
This commit is contained in:
Craig Topper 2017-07-06 23:18:41 +00:00
parent 935243486c
commit 2bb9f0f620
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
View File

@ -750,9 +750,9 @@ Value *InstCombiner::dyn_castFNegVal(Value *V, bool IgnoreZeroSign) const {
} }
static Value *foldOperationIntoSelectOperand(Instruction &I, Value *SO, static Value *foldOperationIntoSelectOperand(Instruction &I, Value *SO,
InstCombiner *IC) { InstCombiner::BuilderTy *Builder) {
if (auto *Cast = dyn_cast<CastInst>(&I)) if (auto *Cast = dyn_cast<CastInst>(&I))
return IC->Builder->CreateCast(Cast->getOpcode(), SO, I.getType()); return Builder->CreateCast(Cast->getOpcode(), SO, I.getType());
assert(I.isBinaryOp() && "Unexpected opcode for select folding"); assert(I.isBinaryOp() && "Unexpected opcode for select folding");
@ -771,7 +771,7 @@ static Value *foldOperationIntoSelectOperand(Instruction &I, Value *SO,
std::swap(Op0, Op1); std::swap(Op0, Op1);
auto *BO = cast<BinaryOperator>(&I); auto *BO = cast<BinaryOperator>(&I);
Value *RI = IC->Builder->CreateBinOp(BO->getOpcode(), Op0, Op1, Value *RI = Builder->CreateBinOp(BO->getOpcode(), Op0, Op1,
SO->getName() + ".op"); SO->getName() + ".op");
auto *FPInst = dyn_cast<Instruction>(RI); auto *FPInst = dyn_cast<Instruction>(RI);
if (FPInst && isa<FPMathOperator>(FPInst)) if (FPInst && isa<FPMathOperator>(FPInst))
@ -824,13 +824,13 @@ Instruction *InstCombiner::FoldOpIntoSelect(Instruction &Op, SelectInst *SI) {
} }
} }
Value *NewTV = foldOperationIntoSelectOperand(Op, TV, this); Value *NewTV = foldOperationIntoSelectOperand(Op, TV, Builder);
Value *NewFV = foldOperationIntoSelectOperand(Op, FV, this); Value *NewFV = foldOperationIntoSelectOperand(Op, FV, Builder);
return SelectInst::Create(SI->getCondition(), NewTV, NewFV, "", nullptr, SI); return SelectInst::Create(SI->getCondition(), NewTV, NewFV, "", nullptr, SI);
} }
static Value *foldOperationIntoPhiValue(BinaryOperator *I, Value *InV, static Value *foldOperationIntoPhiValue(BinaryOperator *I, Value *InV,
InstCombiner *IC) { InstCombiner::BuilderTy *Builder) {
bool ConstIsRHS = isa<Constant>(I->getOperand(1)); bool ConstIsRHS = isa<Constant>(I->getOperand(1));
Constant *C = cast<Constant>(I->getOperand(ConstIsRHS)); Constant *C = cast<Constant>(I->getOperand(ConstIsRHS));
@ -844,7 +844,7 @@ static Value *foldOperationIntoPhiValue(BinaryOperator *I, Value *InV,
if (!ConstIsRHS) if (!ConstIsRHS)
std::swap(Op0, Op1); std::swap(Op0, Op1);
Value *RI = IC->Builder->CreateBinOp(I->getOpcode(), Op0, Op1, "phitmp"); Value *RI = Builder->CreateBinOp(I->getOpcode(), Op0, Op1, "phitmp");
auto *FPInst = dyn_cast<Instruction>(RI); auto *FPInst = dyn_cast<Instruction>(RI);
if (FPInst && isa<FPMathOperator>(FPInst)) if (FPInst && isa<FPMathOperator>(FPInst))
FPInst->copyFastMathFlags(I); FPInst->copyFastMathFlags(I);
@ -969,7 +969,8 @@ Instruction *InstCombiner::foldOpIntoPhi(Instruction &I, PHINode *PN) {
} }
} else if (auto *BO = dyn_cast<BinaryOperator>(&I)) { } else if (auto *BO = dyn_cast<BinaryOperator>(&I)) {
for (unsigned i = 0; i != NumPHIValues; ++i) { for (unsigned i = 0; i != NumPHIValues; ++i) {
Value *InV = foldOperationIntoPhiValue(BO, PN->getIncomingValue(i), this); Value *InV = foldOperationIntoPhiValue(BO, PN->getIncomingValue(i),
Builder);
NewPN->addIncoming(InV, PN->getIncomingBlock(i)); NewPN->addIncoming(InV, PN->getIncomingBlock(i));
} }
} else { } else {