From 1021404619724568d62f53e575b61ae84e82ca02 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Thu, 2 Nov 2023 18:05:05 -0700 Subject: [PATCH] [GISel] Make RegBank constructor constexpr. NFC (#71109) RegBanks are constructed as global objects. Making the constructor constexpr helps the compiler construct it without a global constructor. clang's optimizer seems to figure this out on its own, but at least gcc 8 does not. --- llvm/include/llvm/CodeGen/RegisterBank.h | 4 ++-- llvm/utils/TableGen/RegisterBankEmitter.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/include/llvm/CodeGen/RegisterBank.h b/llvm/include/llvm/CodeGen/RegisterBank.h index 3862b51a132022..3efd896ce05921 100644 --- a/llvm/include/llvm/CodeGen/RegisterBank.h +++ b/llvm/include/llvm/CodeGen/RegisterBank.h @@ -36,8 +36,8 @@ class RegisterBank { friend RegisterBankInfo; public: - RegisterBank(unsigned ID, const char *Name, const uint32_t *CoveredClasses, - unsigned NumRegClasses) + constexpr RegisterBank(unsigned ID, const char *Name, + const uint32_t *CoveredClasses, unsigned NumRegClasses) : ID(ID), NumRegClasses(NumRegClasses), Name(Name), CoveredClasses(CoveredClasses) {} diff --git a/llvm/utils/TableGen/RegisterBankEmitter.cpp b/llvm/utils/TableGen/RegisterBankEmitter.cpp index 60c3fcdba70ed8..f851d9a79870b4 100644 --- a/llvm/utils/TableGen/RegisterBankEmitter.cpp +++ b/llvm/utils/TableGen/RegisterBankEmitter.cpp @@ -244,7 +244,7 @@ void RegisterBankEmitter::emitBaseClassImplementation( for (const auto &Bank : Banks) { std::string QualifiedBankID = (TargetName + "::" + Bank.getEnumeratorName()).str(); - OS << "const RegisterBank " << Bank.getInstanceVarName() << "(/* ID */ " + OS << "constexpr RegisterBank " << Bank.getInstanceVarName() << "(/* ID */ " << QualifiedBankID << ", /* Name */ \"" << Bank.getName() << "\", " << "/* CoveredRegClasses */ " << Bank.getCoverageArrayName() << ", /* NumRegClasses */ "