diff options
Diffstat (limited to 'llvm/lib/Analysis/PHITransAddr.cpp')
| -rw-r--r-- | llvm/lib/Analysis/PHITransAddr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Analysis/PHITransAddr.cpp b/llvm/lib/Analysis/PHITransAddr.cpp index 5b0fbca23891..1262530ae642 100644 --- a/llvm/lib/Analysis/PHITransAddr.cpp +++ b/llvm/lib/Analysis/PHITransAddr.cpp @@ -317,8 +317,7 @@ bool PHITransAddr::PHITranslateValue(BasicBlock *CurBB, BasicBlock *PredBB, assert(DT || !MustDominate); assert(Verify() && "Invalid PHITransAddr!"); if (DT && DT->isReachableFromEntry(PredBB)) - Addr = - PHITranslateSubExpr(Addr, CurBB, PredBB, MustDominate ? DT : nullptr); + Addr = PHITranslateSubExpr(Addr, CurBB, PredBB, DT); else Addr = nullptr; assert(Verify() && "Invalid PHITransAddr!"); @@ -406,7 +405,7 @@ InsertPHITranslatedSubExpr(Value *InVal, BasicBlock *CurBB, } GetElementPtrInst *Result = GetElementPtrInst::Create( - GEP->getSourceElementType(), GEPOps[0], makeArrayRef(GEPOps).slice(1), + GEP->getSourceElementType(), GEPOps[0], ArrayRef(GEPOps).slice(1), InVal->getName() + ".phi.trans.insert", PredBB->getTerminator()); Result->setDebugLoc(Inst->getDebugLoc()); Result->setIsInBounds(GEP->isInBounds()); @@ -425,7 +424,8 @@ InsertPHITranslatedSubExpr(Value *InVal, BasicBlock *CurBB, // PHI translate the LHS. Value *OpVal = InsertPHITranslatedSubExpr(Inst->getOperand(0), CurBB, PredBB, DT, NewInsts); - if (OpVal == 0) return 0; + if (OpVal == nullptr) + return nullptr; BinaryOperator *Res = BinaryOperator::CreateAdd(OpVal, Inst->getOperand(1), InVal->getName()+".phi.trans.insert", |