Update for review feedback.

Author: resistor

llvm/include/llvm/Transforms/Scalar/GVN.h

@@ -249,7 +249,7 @@ class GVNPass : public PassInfoMixin<GVNPass> {
 
   public:
     class leader_iterator {
-      const LeaderListNode *current;
+      const LeaderListNode *Current;
 
     public:
       using iterator_category = std::forward_iterator_tag;
@@ -258,19 +258,19 @@ class GVNPass : public PassInfoMixin<GVNPass> {
       using pointer = value_type *;
       using reference = value_type &;
 
-      leader_iterator(const LeaderListNode *ptr) : current(ptr) {}
+      leader_iterator(const LeaderListNode *C) : Current(C) {}
       leader_iterator &operator++() {
-        assert(current && "Dereferenced end of leader list!");
-        current = current->Next;
+        assert(Current && "Dereferenced end of leader list!");
+        Current = Current->Next;
         return *this;
       }
       bool operator==(const leader_iterator &other) const {
-        return current == other.current;
+        return Current == other.Current;
       }
       bool operator!=(const leader_iterator &other) const {
-        return current != other.current;
+        return Current != other.Current;
       }
-      reference operator*() const { return current->Entry; }
+      reference operator*() const { return Current->Entry; }
     };
 
     iterator_range<leader_iterator> getLeaders(uint32_t N) {
@@ -285,7 +285,7 @@ class GVNPass : public PassInfoMixin<GVNPass> {
     }
 
     void insert(uint32_t N, Value *V, const BasicBlock *BB);
-    void erase(uint32_t N, Instruction *I, BasicBlock *BB);
+    void erase(uint32_t N, Instruction *I, const BasicBlock *BB);
     void verifyRemoved(const Value *Inst) const;
     void clear() {
       NumToLeaders.clear();

llvm/lib/Transforms/Scalar/GVN.cpp

@@ -747,7 +747,8 @@ void GVNPass::LeaderMap::insert(uint32_t N, Value *V, const BasicBlock *BB) {
 
 /// Scan the list of values corresponding to a given
 /// value number, and remove the given instruction if encountered.
-void GVNPass::LeaderMap::erase(uint32_t N, Instruction *I, BasicBlock *BB) {
+void GVNPass::LeaderMap::erase(uint32_t N, Instruction *I,
+                               const BasicBlock *BB) {
   LeaderListNode *Prev = nullptr;
   LeaderListNode *Curr = &NumToLeaders[N];
 
@@ -2267,9 +2268,8 @@ GVNPass::ValueTable::assignExpNewValueNum(Expression &Exp) {
 bool GVNPass::ValueTable::areAllValsInBB(uint32_t Num, const BasicBlock *BB,
                                          GVNPass &Gvn) {
   auto I = Gvn.LeaderTable.getLeaders(Num);
-  return std::all_of(
-      I.begin(), I.end(),
-      [=](const LeaderMap::LeaderTableEntry &L) { return L.BB == BB; });
+  return all_of(
+      I, [=](const LeaderMap::LeaderTableEntry &L) { return L.BB == BB; });
 }
 
 /// Wrap phiTranslateImpl to provide caching functionality.
@@ -2292,7 +2292,7 @@ bool GVNPass::ValueTable::areCallValsEqual(uint32_t Num, uint32_t NewNum,
                                            GVNPass &Gvn) {
   CallInst *Call = nullptr;
   auto Leaders = Gvn.LeaderTable.getLeaders(Num);
-  for (auto Entry : Leaders) {
+  for (const auto &Entry : Leaders) {
     Call = dyn_cast<CallInst>(Entry.Val);
     if (Call && Call->getParent() == PhiBlock)
       break;
@@ -2393,7 +2393,7 @@ Value *GVNPass::findLeader(const BasicBlock *BB, uint32_t num) {
     return nullptr;
 
   Value *Val = nullptr;
-  for (auto Entry : Leaders) {
+  for (const auto &Entry : Leaders) {
     if (DT->dominates(Entry.BB, BB)) {
       Val = Entry.Val;
       if (isa<Constant>(Val))