[NFC] PHITransAddr refactoring

[kachkov98]

Summary

This patch fixes function naming conventions in PHITransAddr methods.

[mkazantsev]

Can you please separate trivial variable renaming from things where you change code? Simple renaming is trivially LGTM'able, the rest might need some comprehending.

[kachkov98]

Split renaming and code changes

[kachkov98]

Separate patch with code changes: https://reviews.llvm.org/D143171

[mkazantsev]

LG, thanks!

Pls give the patch a more sound title, smth like "Fix naming convention for ..."

llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h

 /// This is an entry in the NonLocalDepInfo cache.
 ///
 /// For each BasicBlock (the BB entry) it keeps a MemDepResult.
 class NonLocalDepEntry {
   BasicBlock *BB;
   MemDepResult Result;
 
 public:
-  NonLocalDepEntry(BasicBlock *bb, MemDepResult result)
-      : BB(bb), Result(result) {}
+  NonLocalDepEntry(BasicBlock *BB, MemDepResult Result)
+      : BB(BB), Result(Result) {}
 
   // This is used for searches.
-  NonLocalDepEntry(BasicBlock *bb) : BB(bb) {}
+  NonLocalDepEntry(BasicBlock *BB) : BB(BB) {}
 
   // BB is the sort key, it can't be changed.
   BasicBlock *getBB() const { return BB; }
 
   void setResult(const MemDepResult &R) { Result = R; }
 
   const MemDepResult &getResult() const { return Result; }
 
   bool operator<(const NonLocalDepEntry &RHS) const { return BB < RHS.BB; }
 };
 
 /// This is a result from a NonLocal dependence query.
 ///
 /// For each BasicBlock (the BB entry) it keeps a MemDepResult and the
 /// (potentially phi translated) address that was live in the block.
 class NonLocalDepResult {
   NonLocalDepEntry Entry;
   Value *Address;
 
 public:
-  NonLocalDepResult(BasicBlock *bb, MemDepResult result, Value *address)
-      : Entry(bb, result), Address(address) {}
+  NonLocalDepResult(BasicBlock *BB, MemDepResult Result, Value *Address)
+      : Entry(BB, Result), Address(Address) {}
 
   // BB is the sort key, it can't be changed.
   BasicBlock *getBB() const { return Entry.getBB(); }
 
   void setResult(const MemDepResult &R, Value *Addr) {
     Entry.setResult(R);
     Address = Addr;
   }

llvm/include/llvm/Analysis/MemorySSA.h

private:
   void fillInCurrentPair() {
     CurrentPair.first = *DefIterator;
     CurrentPair.second = Location;
     if (WalkingPhi && Location.Ptr) {
       PHITransAddr Translator(
           const_cast<Value *>(Location.Ptr),
           OriginalAccess->getBlock()->getModule()->getDataLayout(), nullptr);
 
-      if (!Translator.PHITranslateValue(OriginalAccess->getBlock(),
-                                        DefIterator.getPhiArgBlock(), DT, true))
+      if (!Translator.translateValue(OriginalAccess->getBlock(),
         if (Translator.getAddr() != CurrentPair.second.Ptr)
           CurrentPair.second =
               CurrentPair.second.getWithNewPtr(Translator.getAddr());
 
       // Mark size as unknown, if the location is not guaranteed to be
       // loop-invariant for any possible loop in the function. Setting the size
       // to unknown guarantees that any memory accesses that access locations
       // after the pointer are considered as clobbers, which is important to

llvm/include/llvm/Analysis/PHITransAddr.h

 
 #ifndef LLVM_ANALYSIS_PHITRANSADDR_H
 #define LLVM_ANALYSIS_PHITRANSADDR_H
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/IR/Instruction.h"
 
 namespace llvm {
-  class AssumptionCache;
-  class DominatorTree;
-  class DataLayout;
-  class TargetLibraryInfo;
 
 /// PHITransAddr - An address value which tracks and handles phi translation.
 /// As we walk "up" the CFG through predecessors, we need to ensure that the
 /// address we're tracking is kept up to date.  For example, if we're analyzing
 /// an address of "&A[i]" and walk through the definition of 'i' which is a PHI
 /// node, we *must* phi translate i to get "&A[j]" or else we will analyze an
 /// incorrect pointer in the predecessor block.
 ///
class PHITransAddr {
 
   /// A cache of \@llvm.assume calls used by SimplifyInstruction.
   AssumptionCache *AC;
 
   /// InstInputs - The inputs for our symbolic address.
   SmallVector<Instruction*, 4> InstInputs;
 
 public:
-  PHITransAddr(Value *addr, const DataLayout &DL, AssumptionCache *AC)
-      : Addr(addr), DL(DL), AC(AC) {
+  PHITransAddr(Value *Addr, const DataLayout &DL, AssumptionCache *AC)
+      : Addr(Addr), DL(DL), AC(AC) {
     // If the address is an instruction, the whole thing is considered an input.
     if (Instruction *I = dyn_cast<Instruction>(Addr))
       InstInputs.push_back(I);
   }
 
   Value *getAddr() const { return Addr; }
 
-  /// NeedsPHITranslationFromBlock - Return true if moving from the specified
+  /// needsPHITranslationFromBlock - Return true if moving from the specified
   /// BasicBlock to its predecessors requires PHI translation.
-  bool NeedsPHITranslationFromBlock(BasicBlock *BB) const {
+  bool needsPHITranslationFromBlock(BasicBlock *BB) const {
     // We do need translation if one of our input instructions is defined in
     // this block.
     for (unsigned i = 0, e = InstInputs.size(); i != e; ++i)
       if (InstInputs[i]->getParent() == BB)
         return true;
     return false;
   }
 
-  /// IsPotentiallyPHITranslatable - If this needs PHI translation, return true
+  /// isPotentiallyPHITranslatable - If this needs PHI translation, return true
   /// if we have some hope of doing it.  This should be used as a filter to
   /// avoid calling PHITranslateValue in hopeless situations.
-  bool IsPotentiallyPHITranslatable() const;
+  bool isPotentiallyPHITranslatable() const;
 
-  /// PHITranslateValue - PHI translate the current address up the CFG from
+  /// translateValue - PHI translate the current address up the CFG from
   /// CurBB to Pred, updating our state to reflect any needed changes.  If
   /// 'MustDominate' is true, the translated value must dominate
   /// PredBB.  This returns true on failure and sets Addr to null.
-  bool PHITranslateValue(BasicBlock *CurBB, BasicBlock *PredBB,
-                         const DominatorTree *DT, bool MustDominate);
+  bool translateValue(BasicBlock *CurBB, BasicBlock *PredBB,
 
-  /// PHITranslateWithInsertion - PHI translate this value into the specified
+  /// translateWithInsertion - PHI translate this value into the specified
   /// predecessor block, inserting a computation of the value if it is
   /// unavailable.
   ///
   /// All newly created instructions are added to the NewInsts list.  This
   /// returns null on failure.
   ///
-  Value *PHITranslateWithInsertion(BasicBlock *CurBB, BasicBlock *PredBB,
-                                   const DominatorTree &DT,
-                                   SmallVectorImpl<Instruction *> &NewInsts);
+  Value *translateWithInsertion(BasicBlock *CurBB, BasicBlock *PredBB,
 
   void dump() const;
 
-  /// Verify - Check internal consistency of this data structure.  If the
+  /// verify - Check internal consistency of this data structure.  If the
   /// structure is valid, it returns true.  If invalid, it prints errors and
   /// returns false.
-  bool Verify() const;
+  bool verify() const;
 
 private:
-  Value *PHITranslateSubExpr(Value *V, BasicBlock *CurBB, BasicBlock *PredBB,
-                             const DominatorTree *DT);
+  Value *translateSubExpr(Value *V, BasicBlock *CurBB, BasicBlock *PredBB,
 
-  /// InsertPHITranslatedSubExpr - Insert a computation of the PHI translated
+  /// insertTranslatedSubExpr - Insert a computation of the PHI translated
   /// version of 'V' for the edge PredBB->CurBB into the end of the PredBB
   /// block.  All newly created instructions are added to the NewInsts list.
   /// This returns null on failure.
   ///
-  Value *InsertPHITranslatedSubExpr(Value *InVal, BasicBlock *CurBB,
-                                    BasicBlock *PredBB, const DominatorTree &DT,
-                                    SmallVectorImpl<Instruction *> &NewInsts);
+  Value *insertTranslatedSubExpr(Value *InVal, BasicBlock *CurBB,
 
-  /// AddAsInput - If the specified value is an instruction, add it as an input.
-  Value *AddAsInput(Value *V) {
+  /// addAsInput - If the specified value is an instruction, add it as an input.
+  Value *addAsInput(Value *V) {
     // If V is an instruction, it is now an input.
     if (Instruction *VI = dyn_cast<Instruction>(V))
       InstInputs.push_back(VI);
     return V;
   }
 };
 
 } // end namespace llvm
 
 #endif

llvm/lib/Analysis/MemoryDependenceAnalysis.cpp

if (!SkipFirstBlock) {
         }
       }
     }
 
     // If 'Pointer' is an instruction defined in this block, then we need to do
     // phi translation to change it into a value live in the predecessor block.
     // If not, we just add the predecessors to the worklist and scan them with
     // the same Pointer.
-    if (!Pointer.NeedsPHITranslationFromBlock(BB)) {
+    if (!Pointer.needsPHITranslationFromBlock(BB)) {
       SkipFirstBlock = false;
       SmallVector<BasicBlock *, 16> NewBlocks;
       for (BasicBlock *Pred : PredCache.get(BB)) {
         // Verify that we haven't looked at this block yet.
         std::pair<DenseMap<BasicBlock *, Value *>::iterator, bool> InsertRes =
             Visited.insert(std::make_pair(Pred, Pointer.getAddr()));
         if (InsertRes.second) {
           // First time we've looked at *PI.
if (!Pointer.needsPHITranslationFromBlock(BB)) {
       }
       WorklistEntries -= NewBlocks.size();
       Worklist.append(NewBlocks.begin(), NewBlocks.end());
       continue;
     }
 
     // We do need to do phi translation, if we know ahead of time we can't phi
     // translate this value, don't even try.
-    if (!Pointer.IsPotentiallyPHITranslatable())
+    if (!Pointer.isPotentiallyPHITranslatable())
       goto PredTranslationFailure;
 
     // We may have added values to the cache list before this PHI translation.
     // If so, we haven't done anything to ensure that the cache remains sorted.
     // Sort it now (if needed) so that recursive invocations of
     // getNonLocalPointerDepFromBB and other routines that could reuse the cache
     // value will only see properly sorted cache arrays.
     if (Cache && NumSortedEntries != Cache->size()) {
       SortNonLocalDepInfoCache(*Cache, NumSortedEntries);
       NumSortedEntries = Cache->size();
     }
     Cache = nullptr;
 
     PredList.clear();
     for (BasicBlock *Pred : PredCache.get(BB)) {
       PredList.push_back(std::make_pair(Pred, Pointer));
 
       // Get the PHI translated pointer in this predecessor.  This can fail if
       // not translatable, in which case the getAddr() returns null.
       PHITransAddr &PredPointer = PredList.back().second;
-      PredPointer.PHITranslateValue(BB, Pred, &DT, /*MustDominate=*/false);
+      PredPointer.translateValue(BB, Pred, &DT, /*MustDominate=*/false);
       Value *PredPtrVal = PredPointer.getAddr();
 
       // Check to see if we have already visited this pred block with another
       // pointer.  If so, we can't do this lookup.  This failure can occur
       // with PHI translation when a critical edge exists and the PHI node in
       // the successor translates to a pointer value different than the
       // pointer the block was first analyzed with.
       std::pair<DenseMap<BasicBlock *, Value *>::iterator, bool> InsertRes =

llvm/lib/Analysis/PHITransAddr.cpp

 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
 static cl::opt<bool> EnableAddPhiTranslation(
     "gvn-add-phi-translation", cl::init(false), cl::Hidden,
     cl::desc("Enable phi-translation of add instructions"));
 
-static bool CanPHITrans(Instruction *Inst) {
+static bool canPHITrans(Instruction *Inst) {
   if (isa<PHINode>(Inst) ||
       isa<GetElementPtrInst>(Inst))
     return true;
 
   if (isa<CastInst>(Inst) &&
       isSafeToSpeculativelyExecute(Inst))
     return true;
 
if (!Addr) {
     return;
   }
   dbgs() << "PHITransAddr: " << *Addr << "\n";
   for (unsigned i = 0, e = InstInputs.size(); i != e; ++i)
     dbgs() << "  Input #" << i << " is " << *InstInputs[i] << "\n";
 }
 #endif
 
-
-static bool VerifySubExpr(Value *Expr,
-                          SmallVectorImpl<Instruction*> &InstInputs) {
+static bool verifySubExpr(Value *Expr,
+                          SmallVectorImpl<Instruction *> &InstInputs) {
   // If this is a non-instruction value, there is nothing to do.
   Instruction *I = dyn_cast<Instruction>(Expr);
   if (!I) return true;
 
   // If it's an instruction, it is either in Tmp or its operands recursively
   // are.
   SmallVectorImpl<Instruction *>::iterator Entry = find(InstInputs, I);
   if (Entry != InstInputs.end()) {
     InstInputs.erase(Entry);
     return true;
   }
 
   // If it isn't in the InstInputs list it is a subexpr incorporated into the
   // address.  Validate that it is phi translatable.
-  if (!CanPHITrans(I)) {
+  if (!canPHITrans(I)) {
     errs() << "Instruction in PHITransAddr is not phi-translatable:\n";
     errs() << *I << '\n';
     llvm_unreachable("Either something is missing from InstInputs or "
-                     "CanPHITrans is wrong.");
+                     "canPHITrans is wrong.");
   }
 
   // Validate the operands of the instruction.
   for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i)
-    if (!VerifySubExpr(I->getOperand(i), InstInputs))
+    if (!verifySubExpr(I->getOperand(i), InstInputs))
       return false;
 
   return true;
 }
 
-/// Verify - Check internal consistency of this data structure.  If the
+/// verify - Check internal consistency of this data structure.  If the
 /// structure is valid, it returns true.  If invalid, it prints errors and
 /// returns false.
-bool PHITransAddr::Verify() const {
+bool PHITransAddr::verify() const {
   if (!Addr) return true;
 
   SmallVector<Instruction*, 8> Tmp(InstInputs.begin(), InstInputs.end());
 
-  if (!VerifySubExpr(Addr, Tmp))
+  if (!verifySubExpr(Addr, Tmp))
     return false;
 
   if (!Tmp.empty()) {
     errs() << "PHITransAddr contains extra instructions:\n";
     for (unsigned i = 0, e = InstInputs.size(); i != e; ++i)
       errs() << "  InstInput #" << i << " is " << *InstInputs[i] << "\n";
     llvm_unreachable("This is unexpected.");
   }
 
   // a-ok.
   return true;
 }
 
-
-/// IsPotentiallyPHITranslatable - If this needs PHI translation, return true
+/// isPotentiallyPHITranslatable - If this needs PHI translation, return true
 /// if we have some hope of doing it.  This should be used as a filter to
 /// avoid calling PHITranslateValue in hopeless situations.
-bool PHITransAddr::IsPotentiallyPHITranslatable() const {
+bool PHITransAddr::isPotentiallyPHITranslatable() const {
   // If the input value is not an instruction, or if it is not defined in CurBB,
   // then we don't need to phi translate it.
   Instruction *Inst = dyn_cast<Instruction>(Addr);
-  return !Inst || CanPHITrans(Inst);
+  return !Inst || canPHITrans(Inst);
 }
 
-
 static void RemoveInstInputs(Value *V,
                              SmallVectorImpl<Instruction*> &InstInputs) {
   Instruction *I = dyn_cast<Instruction>(V);
   if (!I) return;
 
   // If the instruction is in the InstInputs list, remove it.
   SmallVectorImpl<Instruction *>::iterator Entry = find(InstInputs, I);
   if (Entry != InstInputs.end()) {
     InstInputs.erase(Entry);
     return;
   }
 
   assert(!isa<PHINode>(I) && "Error, removing something that isn't an input");
 
   // Otherwise, it must have instruction inputs itself.  Zap them recursively.
   for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i) {
     if (Instruction *Op = dyn_cast<Instruction>(I->getOperand(i)))
       RemoveInstInputs(Op, InstInputs);
   }
 }
 
-Value *PHITransAddr::PHITranslateSubExpr(Value *V, BasicBlock *CurBB,
-                                         BasicBlock *PredBB,
-                                         const DominatorTree *DT) {
+Value *PHITransAddr::translateSubExpr(Value *V, BasicBlock *CurBB,
   // If this is a non-instruction value, it can't require PHI translation.
   Instruction *Inst = dyn_cast<Instruction>(V);
   if (!Inst) return V;
 
   // Determine whether 'Inst' is an input to our PHI translatable expression.
   bool isInput = is_contained(InstInputs, Inst);
 
   // Handle inputs instructions if needed.
   if (isInput) {
     if (Inst->getParent() != CurBB) {
       // If it is an input defined in a different block, then it remains an
       // input.
       return Inst;
     }
 
     // If 'Inst' is defined in this block and is an input that needs to be phi
     // translated, we need to incorporate the value into the expression or fail.
 
     // In either case, the instruction itself isn't an input any longer.
     InstInputs.erase(find(InstInputs, Inst));
 
     // If this is a PHI, go ahead and translate it.
     if (PHINode *PN = dyn_cast<PHINode>(Inst))
-      return AddAsInput(PN->getIncomingValueForBlock(PredBB));
+      return addAsInput(PN->getIncomingValueForBlock(PredBB));
 
     // If this is a non-phi value, and it is analyzable, we can incorporate it
     // into the expression by making all instruction operands be inputs.
-    if (!CanPHITrans(Inst))
+    if (!canPHITrans(Inst))
       return nullptr;
 
     // All instruction operands are now inputs (and of course, they may also be
     // defined in this block, so they may need to be phi translated themselves.
     for (unsigned i = 0, e = Inst->getNumOperands(); i != e; ++i)
       if (Instruction *Op = dyn_cast<Instruction>(Inst->getOperand(i)))
         InstInputs.push_back(Op);
   }
 
   // Ok, it must be an intermediate result (either because it started that way
   // or because we just incorporated it into the expression).  See if its
   // operands need to be phi translated, and if so, reconstruct it.
 
   if (CastInst *Cast = dyn_cast<CastInst>(Inst)) {
     if (!isSafeToSpeculativelyExecute(Cast)) return nullptr;
-    Value *PHIIn = PHITranslateSubExpr(Cast->getOperand(0), CurBB, PredBB, DT);
+    Value *PHIIn = translateSubExpr(Cast->getOperand(0), CurBB, PredBB, DT);
     if (!PHIIn) return nullptr;
     if (PHIIn == Cast->getOperand(0))
       return Cast;
 
     // Find an available version of this cast.
 
     // Constants are trivial to find.
     if (Constant *C = dyn_cast<Constant>(PHIIn))
-      return AddAsInput(ConstantExpr::getCast(Cast->getOpcode(),
-                                              C, Cast->getType()));
+      return addAsInput(
+          ConstantExpr::getCast(Cast->getOpcode(), C, Cast->getType()));
 
     // Otherwise we have to see if a casted version of the incoming pointer
     // is available.  If so, we can use it, otherwise we have to fail.
     for (User *U : PHIIn->users()) {
       if (CastInst *CastI = dyn_cast<CastInst>(U))
         if (CastI->getOpcode() == Cast->getOpcode() &&
             CastI->getType() == Cast->getType() &&
             (!DT || DT->dominates(CastI->getParent(), PredBB)))
           return CastI;
     }
     return nullptr;
   }
 
   // Handle getelementptr with at least one PHI translatable operand.
   if (GetElementPtrInst *GEP = dyn_cast<GetElementPtrInst>(Inst)) {
     SmallVector<Value*, 8> GEPOps;
     bool AnyChanged = false;
     for (unsigned i = 0, e = GEP->getNumOperands(); i != e; ++i) {
-      Value *GEPOp = PHITranslateSubExpr(GEP->getOperand(i), CurBB, PredBB, DT);
+      Value *GEPOp = translateSubExpr(GEP->getOperand(i), CurBB, PredBB, DT);
       if (!GEPOp) return nullptr;
 
       AnyChanged |= GEPOp != GEP->getOperand(i);
       GEPOps.push_back(GEPOp);
     }
 
     if (!AnyChanged)
       return GEP;
 
     // Simplify the GEP to handle 'gep x, 0' -> x etc.
     if (Value *V = simplifyGEPInst(GEP->getSourceElementType(), GEPOps[0],
                                    ArrayRef<Value *>(GEPOps).slice(1),
                                    GEP->isInBounds(), {DL, TLI, DT, AC})) {
       for (unsigned i = 0, e = GEPOps.size(); i != e; ++i)
         RemoveInstInputs(GEPOps[i], InstInputs);
 
-      return AddAsInput(V);
+      return addAsInput(V);
     }
 
     // Scan to see if we have this GEP available.
     Value *APHIOp = GEPOps[0];
     for (User *U : APHIOp->users()) {
       if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(U))
         if (GEPI->getType() == GEP->getType() &&
             GEPI->getSourceElementType() == GEP->getSourceElementType() &&
Value *PHITransAddr::translateSubExpr(Value *V, BasicBlock *CurBB,
   // Handle add with a constant RHS.
   if (Inst->getOpcode() == Instruction::Add &&
       isa<ConstantInt>(Inst->getOperand(1))) {
     // PHI translate the LHS.
     Constant *RHS = cast<ConstantInt>(Inst->getOperand(1));
     bool isNSW = cast<BinaryOperator>(Inst)->hasNoSignedWrap();
     bool isNUW = cast<BinaryOperator>(Inst)->hasNoUnsignedWrap();
 
-    Value *LHS = PHITranslateSubExpr(Inst->getOperand(0), CurBB, PredBB, DT);
+    Value *LHS = translateSubExpr(Inst->getOperand(0), CurBB, PredBB, DT);
     if (!LHS) return nullptr;
 
     // If the PHI translated LHS is an add of a constant, fold the immediates.
     if (BinaryOperator *BOp = dyn_cast<BinaryOperator>(LHS))
       if (BOp->getOpcode() == Instruction::Add)
         if (ConstantInt *CI = dyn_cast<ConstantInt>(BOp->getOperand(1))) {
           LHS = BOp->getOperand(0);
           RHS = ConstantExpr::getAdd(RHS, CI);
           isNSW = isNUW = false;
 
           // If the old 'LHS' was an input, add the new 'LHS' as an input.
           if (is_contained(InstInputs, BOp)) {
             RemoveInstInputs(BOp, InstInputs);
-            AddAsInput(LHS);
+            addAsInput(LHS);
           }
         }
 
     // See if the add simplifies away.
     if (Value *Res = simplifyAddInst(LHS, RHS, isNSW, isNUW, {DL, TLI, DT, AC})) {
       // If we simplified the operands, the LHS is no longer an input, but Res
       // is.
       RemoveInstInputs(LHS, InstInputs);
-      return AddAsInput(Res);
+      return addAsInput(Res);
     }
 
     // If we didn't modify the add, just return it.
     if (LHS == Inst->getOperand(0) && RHS == Inst->getOperand(1))
       return Inst;
 
     // Otherwise, see if we have this add available somewhere.
     for (User *U : LHS->users()) {
       if (BinaryOperator *BO = dyn_cast<BinaryOperator>(U))
         if (BO->getOpcode() == Instruction::Add &&
             BO->getOperand(0) == LHS && BO->getOperand(1) == RHS &&
             BO->getParent()->getParent() == CurBB->getParent() &&
             (!DT || DT->dominates(BO->getParent(), PredBB)))
           return BO;
     }
 
     return nullptr;
   }
 
   // Otherwise, we failed.
   return nullptr;
 }
 
-
 /// PHITranslateValue - PHI translate the current address up the CFG from
 /// CurBB to Pred, updating our state to reflect any needed changes.  If
 /// 'MustDominate' is true, the translated value must dominate
 /// PredBB.  This returns true on failure and sets Addr to null.
-bool PHITransAddr::PHITranslateValue(BasicBlock *CurBB, BasicBlock *PredBB,
-                                     const DominatorTree *DT,
-                                     bool MustDominate) {
+bool PHITransAddr::translateValue(BasicBlock *CurBB, BasicBlock *PredBB,
+                                  const DominatorTree *DT, bool MustDominate) {
   assert(DT || !MustDominate);
-  assert(Verify() && "Invalid PHITransAddr!");
+  assert(verify() && "Invalid PHITransAddr!");
   if (DT && DT->isReachableFromEntry(PredBB))
-    Addr = PHITranslateSubExpr(Addr, CurBB, PredBB, DT);
+    Addr = translateSubExpr(Addr, CurBB, PredBB, DT);
   else
     Addr = nullptr;
-  assert(Verify() && "Invalid PHITransAddr!");
+  assert(verify() && "Invalid PHITransAddr!");
 
   if (MustDominate)
     // Make sure the value is live in the predecessor.
     if (Instruction *Inst = dyn_cast_or_null<Instruction>(Addr))
       if (!DT->dominates(Inst->getParent(), PredBB))
         Addr = nullptr;
 
   return Addr == nullptr;
 }
 
 /// PHITranslateWithInsertion - PHI translate this value into the specified
 /// predecessor block, inserting a computation of the value if it is
 /// unavailable.
 ///
 /// All newly created instructions are added to the NewInsts list.  This
 /// returns null on failure.
 ///
-Value *PHITransAddr::
-PHITranslateWithInsertion(BasicBlock *CurBB, BasicBlock *PredBB,
+Value *
+PHITransAddr::translateWithInsertion(BasicBlock *CurBB, BasicBlock *PredBB,
                                      const DominatorTree &DT,
-                          SmallVectorImpl<Instruction*> &NewInsts) {
+                                     SmallVectorImpl<Instruction *> &NewInsts) {
   unsigned NISize = NewInsts.size();
 
   // Attempt to PHI translate with insertion.
-  Addr = InsertPHITranslatedSubExpr(Addr, CurBB, PredBB, DT, NewInsts);
+  Addr = insertTranslatedSubExpr(Addr, CurBB, PredBB, DT, NewInsts);
 
   // If successful, return the new value.
   if (Addr) return Addr;
 
   // If not, destroy any intermediate instructions inserted.
   while (NewInsts.size() != NISize)
     NewInsts.pop_back_val()->eraseFromParent();
   return nullptr;
 }
 
-
-/// InsertPHITranslatedPointer - Insert a computation of the PHI translated
+/// insertTranslatedSubExpr - Insert a computation of the PHI translated
 /// version of 'V' for the edge PredBB->CurBB into the end of the PredBB
 /// block.  All newly created instructions are added to the NewInsts list.
 /// This returns null on failure.
 ///
-Value *PHITransAddr::
-InsertPHITranslatedSubExpr(Value *InVal, BasicBlock *CurBB,
-                           BasicBlock *PredBB, const DominatorTree &DT,
-                           SmallVectorImpl<Instruction*> &NewInsts) {
+Value *PHITransAddr::insertTranslatedSubExpr(
+    Value *InVal, BasicBlock *CurBB, BasicBlock *PredBB,
+    const DominatorTree &DT, SmallVectorImpl<Instruction *> &NewInsts) {
   // See if we have a version of this value already available and dominating
   // PredBB.  If so, there is no need to insert a new instance of it.
   PHITransAddr Tmp(InVal, DL, AC);
-  if (!Tmp.PHITranslateValue(CurBB, PredBB, &DT, /*MustDominate=*/true))
+  if (!Tmp.translateValue(CurBB, PredBB, &DT, /*MustDominate=*/true))
     return Tmp.getAddr();
 
   // We don't need to PHI translate values which aren't instructions.
   auto *Inst = dyn_cast<Instruction>(InVal);
   if (!Inst)
     return nullptr;
 
   // Handle cast of PHI translatable value.
   if (CastInst *Cast = dyn_cast<CastInst>(Inst)) {
     if (!isSafeToSpeculativelyExecute(Cast)) return nullptr;
-    Value *OpVal = InsertPHITranslatedSubExpr(Cast->getOperand(0),
-                                              CurBB, PredBB, DT, NewInsts);
+    Value *OpVal = insertTranslatedSubExpr(Cast->getOperand(0), CurBB, PredBB,
+                                           DT, NewInsts);
     if (!OpVal) return nullptr;
 
     // Otherwise insert a cast at the end of PredBB.
     CastInst *New = CastInst::Create(Cast->getOpcode(), OpVal, InVal->getType(),
                                      InVal->getName() + ".phi.trans.insert",
                                      PredBB->getTerminator());
     New->setDebugLoc(Inst->getDebugLoc());
     NewInsts.push_back(New);
     return New;
   }
 
   // Handle getelementptr with at least one PHI operand.
   if (GetElementPtrInst *GEP = dyn_cast<GetElementPtrInst>(Inst)) {
     SmallVector<Value*, 8> GEPOps;
     BasicBlock *CurBB = GEP->getParent();
     for (unsigned i = 0, e = GEP->getNumOperands(); i != e; ++i) {
-      Value *OpVal = InsertPHITranslatedSubExpr(GEP->getOperand(i),
-                                                CurBB, PredBB, DT, NewInsts);
+      Value *OpVal = insertTranslatedSubExpr(GEP->getOperand(i), CurBB, PredBB,
+                                             DT, NewInsts);
       if (!OpVal) return nullptr;
       GEPOps.push_back(OpVal);
     }
 
     GetElementPtrInst *Result = GetElementPtrInst::Create(
         GEP->getSourceElementType(), GEPOps[0], ArrayRef(GEPOps).slice(1),
         InVal->getName() + ".phi.trans.insert", PredBB->getTerminator());
     Result->setDebugLoc(Inst->getDebugLoc());
     Result->setIsInBounds(GEP->isInBounds());
     NewInsts.push_back(Result);
     return Result;
   }
 
   // Handle add with a constant RHS.
   if (EnableAddPhiTranslation && Inst->getOpcode() == Instruction::Add &&
       isa<ConstantInt>(Inst->getOperand(1))) {
 
     // FIXME: This code works, but it is unclear that we actually want to insert
     // a big chain of computation in order to make a value available in a block.
     // This needs to be evaluated carefully to consider its cost trade offs.
 
     // PHI translate the LHS.
-    Value *OpVal = InsertPHITranslatedSubExpr(Inst->getOperand(0),
-                                              CurBB, PredBB, DT, NewInsts);
+    Value *OpVal = insertTranslatedSubExpr(Inst->getOperand(0), CurBB, PredBB,
+                                           DT, NewInsts);
     if (OpVal == nullptr)
       return nullptr;
 
     BinaryOperator *Res = BinaryOperator::CreateAdd(OpVal, Inst->getOperand(1),
                                            InVal->getName()+".phi.trans.insert",
                                                     PredBB->getTerminator());
     Res->setHasNoSignedWrap(cast<BinaryOperator>(Inst)->hasNoSignedWrap());
     Res->setHasNoUnsignedWrap(cast<BinaryOperator>(Inst)->hasNoUnsignedWrap());
     NewInsts.push_back(Res);
     return Res;
   }
 
   return nullptr;
 }

llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp

for (; BI != EI; ++BI) {
         if (isModSet(AA.getModRefInfo(I, MemLoc.getWithNewPtr(Ptr))))
           return false;
     }
     if (B != FirstBB) {
       assert(B != &FirstBB->getParent()->getEntryBlock() &&
           "Should not hit the entry block because SI must be dominated by LI");
       for (BasicBlock *Pred : predecessors(B)) {
         PHITransAddr PredAddr = Addr;
-        if (PredAddr.NeedsPHITranslationFromBlock(B)) {
-          if (!PredAddr.IsPotentiallyPHITranslatable())
+        if (PredAddr.needsPHITranslationFromBlock(B)) {
+          if (!PredAddr.isPotentiallyPHITranslatable())
             return false;
-          if (PredAddr.PHITranslateValue(B, Pred, DT, false))
+          if (PredAddr.translateValue(B, Pred, DT, false))
             return false;
         }
         Value *TranslatedPtr = PredAddr.getAddr();
         auto Inserted = Visited.insert(std::make_pair(Pred, TranslatedPtr));
         if (!Inserted.second) {
           // We already visited this block before. If it was with a different
           // address - bail out!
           if (TranslatedPtr != Inserted.first->second)

llvm/lib/Transforms/Scalar/GVN.cpp

for (auto &PredLoad : PredLoads) {
 
     // If all preds have a single successor, then we know it is safe to insert
     // the load on the pred (?!?), so we can insert code to materialize the
     // pointer if it is not available.
     Value *LoadPtr = Load->getPointerOperand();
     BasicBlock *Cur = Load->getParent();
     while (Cur != LoadBB) {
       PHITransAddr Address(LoadPtr, DL, AC);
-      LoadPtr = Address.PHITranslateWithInsertion(
-          Cur, Cur->getSinglePredecessor(), *DT, NewInsts);
+      LoadPtr = Address.translateWithInsertion(Cur, Cur->getSinglePredecessor(),
+                                               *DT, NewInsts);
       if (!LoadPtr) {
         CanDoPRE = false;
         break;
       }
       Cur = Cur->getSinglePredecessor();
     }
 
     if (LoadPtr) {
       PHITransAddr Address(LoadPtr, DL, AC);
-      LoadPtr = Address.PHITranslateWithInsertion(LoadBB, UnavailablePred, *DT,
-                                                  NewInsts);
+      LoadPtr = Address.translateWithInsertion(LoadBB, UnavailablePred, *DT,
     }
     // If we couldn't find or insert a computation of this phi translated value,
     // we fail PRE.
     if (!LoadPtr) {
       LLVM_DEBUG(dbgs() << "COULDN'T INSERT PHI TRANSLATED VALUE OF: "
                         << *Load->getPointerOperand() << "\n");
       CanDoPRE = false;
       break;