1 files changed, 6 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp b/llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp
index 032908f4479..1f497ec9212 100644
--- a/llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp
@@ -68,13 +68,13 @@ RegisterBankInfo::RegisterBankInfo(unsigned NumRegBanks)
 }
 
 bool RegisterBankInfo::verify(const TargetRegisterInfo &TRI) const {
-  for (unsigned Idx = 0, End = getNumRegBanks(); Idx != End; ++Idx) {
+  DEBUG(for (unsigned Idx = 0, End = getNumRegBanks(); Idx != End; ++Idx) {
     const RegisterBank &RegBank = getRegBank(Idx);
     assert(Idx == RegBank.getID() &&
            "ID does not match the index in the array");
-    DEBUG(dbgs() << "Verify " << RegBank << '\n');
+    dbgs() << "Verify " << RegBank << '\n';
     assert(RegBank.verify(TRI) && "RegBank is invalid");
-  }
+  });
   return true;
 }
 
@@ -450,6 +450,7 @@ bool RegisterBankInfo::InstructionMapping::verify(
   for (unsigned Idx = 0; Idx < NumOperands; ++Idx) {
     const MachineOperand &MO = MI.getOperand(Idx);
     const RegisterBankInfo::ValueMapping &MOMapping = getOperandMapping(Idx);
+    (void)MOMapping;
     if (!MO.isReg()) {
       assert(MOMapping.BreakDown.empty() &&
              "We should not care about non-reg mapping");
@@ -460,8 +461,8 @@ bool RegisterBankInfo::InstructionMapping::verify(
       continue;
     // Register size in bits.
     // This size must match what the mapping expects.
-    unsigned RegSize = getSizeInBits(Reg, MRI, TRI);
-    assert(MOMapping.verify(RegSize) && "Value mapping is invalid");
+    assert(MOMapping.verify(getSizeInBits(Reg, MRI, TRI)) &&
+           "Value mapping is invalid");
   }
   return true;
 }