diff --git a/lib/CodeGen/MIRVRegNamerUtils.cpp b/lib/CodeGen/MIRVRegNamerUtils.cpp
index 898efd14d99..8b17f78e0bc 100644
--- a/lib/CodeGen/MIRVRegNamerUtils.cpp
+++ b/lib/CodeGen/MIRVRegNamerUtils.cpp
@@ -95,7 +95,7 @@ unsigned VRegRenamer::createVirtualRegister(unsigned VReg) {
 
 bool VRegRenamer::renameInstsInMBB(MachineBasicBlock *MBB) {
   std::vector<NamedVReg> VRegs;
-  std::string Prefix = "bb" + std::to_string(getCurrentBBNumber()) + "_";
+  std::string Prefix = "bb" + std::to_string(CurrentBBNumber) + "_";
   for (MachineInstr &Candidate : *MBB) {
     // Don't rename stores/branches.
     if (Candidate.mayStore() || Candidate.isBranch())
@@ -114,11 +114,6 @@ bool VRegRenamer::renameInstsInMBB(MachineBasicBlock *MBB) {
   return VRegs.size() ? doVRegRenaming(getVRegRenameMap(VRegs)) : false;
 }
 
-bool VRegRenamer::renameVRegs(MachineBasicBlock *MBB, unsigned BBNum) {
-  CurrentBBNumber = BBNum;
-  return renameInstsInMBB(MBB);
-}
-
 unsigned VRegRenamer::createVirtualRegisterWithLowerName(unsigned VReg,
                                                          StringRef Name) {
   std::string LowerName = Name.lower();
diff --git a/lib/CodeGen/MIRVRegNamerUtils.h b/lib/CodeGen/MIRVRegNamerUtils.h
index 98b0aeac3b2..0c0a71a1324 100644
--- a/lib/CodeGen/MIRVRegNamerUtils.h
+++ b/lib/CodeGen/MIRVRegNamerUtils.h
@@ -64,10 +64,6 @@ class VRegRenamer {
   /// Perform replacing of registers based on the <old,new> vreg map.
   bool doVRegRenaming(const std::map<unsigned, unsigned> &VRegRenameMap);
 
-public:
-  VRegRenamer() = delete;
-  VRegRenamer(MachineRegisterInfo &MRI) : MRI(MRI) {}
-
   /// createVirtualRegister - Given an existing vreg, create a named vreg to
   /// take its place. The name is determined by calling
   /// getInstructionOpcodeHash.
@@ -80,11 +76,16 @@ public:
   /// Names are as follows bb<BBNum>_hash_[0-9]+
   bool renameInstsInMBB(MachineBasicBlock *MBB);
 
+public:
+  VRegRenamer() = delete;
+  VRegRenamer(MachineRegisterInfo &MRI) : MRI(MRI) {}
+
   /// Same as the above, but sets a BBNum depending on BB traversal that
   /// will be used as prefix for the vreg names.
-  bool renameVRegs(MachineBasicBlock *MBB, unsigned BBNum);
-
-  unsigned getCurrentBBNumber() const { return CurrentBBNumber; }
+  bool renameVRegs(MachineBasicBlock *MBB, unsigned BBNum) {
+    CurrentBBNumber = BBNum;
+    return renameInstsInMBB(MBB);
+  }
 };
 
 } // namespace llvm