[globalisel] Stop requiring -debug/-debug-only=registerbankinfo for assertions.

[dsanders]

Summary

I've noticed that these assertions don't trigger when the condition is false.
The problem is that the DEBUG(x) macro only executes x when the pass is
emitting debug output via the -debug and -debug-only=registerbankinfo command
line arguments.

Debug builds should always execute the assertions so use '#ifndef NDEBUG' instead.

Also removed an assertion that is only true the first time it's tested. <Target>RegisterBankInfo's constructor will re-use register banks causing them to be valid on subsequent tests. That
assertion will fail on the first test too in the near future.

[qcolombet]

Hi Daniel,

Good catch!

LGTM. Nitpicks below.

Cheers,
-Quentin

lib/CodeGen/GlobalISel/RegisterBankInfo.cpp

58

#ifndef NDEBUG, right?

75

Ditto.

[dsanders]

lib/CodeGen/GlobalISel/RegisterBankInfo.cpp

58

Yes, you're right. It looks like I accidentally inverted it when I separated it from my WIP.

[dsanders]

lib/CodeGen/GlobalISel/RegisterBankInfo.cpp

61–62

Fixing the typo revealed that this assertion triggers on trunk because of the AlreadyInit mechanism. I've removed this assert because it's only true the first time <Target>RegisterBankInfo is constructed and because will never be true once D27809 lands.

lib/CodeGen/GlobalISel/RegisterBankInfo.cpp

 const unsigned RegisterBankInfo::InvalidMappingID = UINT_MAX - 1;
 
 //------------------------------------------------------------------------------
 // RegisterBankInfo implementation.
 //------------------------------------------------------------------------------
 RegisterBankInfo::RegisterBankInfo(RegisterBank **RegBanks,
                                    unsigned NumRegBanks)
     : RegBanks(RegBanks), NumRegBanks(NumRegBanks) {
-  DEBUG(for (unsigned Idx = 0, End = getNumRegBanks(); Idx != End; ++Idx) {
+#ifdef NDEBUG
+  for (unsigned Idx = 0, End = getNumRegBanks(); Idx != End; ++Idx) {
     assert(RegBanks[Idx] != nullptr && "Invalid RegisterBank");
     assert(!RegBanks[Idx]->isValid() &&
            "RegisterBank should be invalid before initialization");
-  });
+  }
+#endif // NDEBUG
 }
 
 RegisterBankInfo::~RegisterBankInfo() {
   for (auto It : MapOfPartialMappings)
     delete It.second;
   for (auto It : MapOfValueMappings)
     delete It.second;
 }
 
 bool RegisterBankInfo::verify(const TargetRegisterInfo &TRI) const {
-  DEBUG(for (unsigned Idx = 0, End = getNumRegBanks(); Idx != End; ++Idx) {
+#ifdef NDEBUG
+  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");
     dbgs() << "Verify " << RegBank << '\n';
     assert(RegBank.verify(TRI) && "RegBank is invalid");
-  });
+  }
+#endif // NDEBUG
   return true;
 }
 
 void RegisterBankInfo::createRegisterBank(unsigned ID, const char *Name) {
   DEBUG(dbgs() << "Create register bank: " << ID << " with name \"" << Name
                << "\"\n");
   RegisterBank &RegBank = getRegBank(ID);
   assert(RegBank.getID() == RegisterBank::InvalidID &&