llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Rahul Joshi (jurahul) <details> <summary>Changes</summary> Change RISCVVEmitter to use const RecordKeeper. This is a part of effort to have better const correctness in TableGen backends: https://discourse.llvm.org/t/psa-planned-changes-to-tablegen-getallderiveddefinitions-api-potential-downstream-breakages/81089 --- Full diff: https://github.com/llvm/llvm-project/pull/108502.diff 2 Files Affected: - (modified) clang/utils/TableGen/RISCVVEmitter.cpp (+10-13) - (modified) clang/utils/TableGen/TableGenBackends.h (+5-4) ``````````diff diff --git a/clang/utils/TableGen/RISCVVEmitter.cpp b/clang/utils/TableGen/RISCVVEmitter.cpp index d05236bb4e909a..4ef83e7b608dc0 100644 --- a/clang/utils/TableGen/RISCVVEmitter.cpp +++ b/clang/utils/TableGen/RISCVVEmitter.cpp @@ -95,11 +95,11 @@ class SemaSignatureTable { class RVVEmitter { private: - RecordKeeper &Records; + const RecordKeeper &Records; RVVTypeCache TypeCache; public: - RVVEmitter(RecordKeeper &R) : Records(R) {} + RVVEmitter(const RecordKeeper &R) : Records(R) {} /// Emit riscv_vector.h void createHeader(raw_ostream &o); @@ -554,8 +554,7 @@ void RVVEmitter::createCodeGen(raw_ostream &OS) { void RVVEmitter::createRVVIntrinsics( std::vector<std::unique_ptr<RVVIntrinsic>> &Out, std::vector<SemaRecord> *SemaRecords) { - std::vector<Record *> RV = Records.getAllDerivedDefinitions("RVVBuiltin"); - for (auto *R : RV) { + for (const Record *R : Records.getAllDerivedDefinitions("RVVBuiltin")) { StringRef Name = R->getValueAsString("Name"); StringRef SuffixProto = R->getValueAsString("Suffix"); StringRef OverloadedName = R->getValueAsString("OverloadedName"); @@ -565,10 +564,10 @@ void RVVEmitter::createRVVIntrinsics( bool HasMasked = R->getValueAsBit("HasMasked"); bool HasMaskedOffOperand = R->getValueAsBit("HasMaskedOffOperand"); bool HasVL = R->getValueAsBit("HasVL"); - Record *MPSRecord = R->getValueAsDef("MaskedPolicyScheme"); + const Record *MPSRecord = R->getValueAsDef("MaskedPolicyScheme"); auto MaskedPolicyScheme = static_cast<PolicyScheme>(MPSRecord->getValueAsInt("Value")); - Record *UMPSRecord = R->getValueAsDef("UnMaskedPolicyScheme"); + const Record *UMPSRecord = R->getValueAsDef("UnMaskedPolicyScheme"); auto UnMaskedPolicyScheme = static_cast<PolicyScheme>(UMPSRecord->getValueAsInt("Value")); std::vector<int64_t> Log2LMULList = R->getValueAsListOfInts("Log2LMUL"); @@ -752,9 +751,7 @@ void RVVEmitter::createRVVIntrinsics( } void RVVEmitter::printHeaderCode(raw_ostream &OS) { - std::vector<Record *> RVVHeaders = - Records.getAllDerivedDefinitions("RVVHeader"); - for (auto *R : RVVHeaders) { + for (const Record *R : Records.getAllDerivedDefinitions("RVVHeader")) { StringRef HeaderCodeStr = R->getValueAsString("HeaderCode"); OS << HeaderCodeStr.str(); } @@ -822,19 +819,19 @@ void RVVEmitter::createSema(raw_ostream &OS) { } namespace clang { -void EmitRVVHeader(RecordKeeper &Records, raw_ostream &OS) { +void EmitRVVHeader(const RecordKeeper &Records, raw_ostream &OS) { RVVEmitter(Records).createHeader(OS); } -void EmitRVVBuiltins(RecordKeeper &Records, raw_ostream &OS) { +void EmitRVVBuiltins(const RecordKeeper &Records, raw_ostream &OS) { RVVEmitter(Records).createBuiltins(OS); } -void EmitRVVBuiltinCG(RecordKeeper &Records, raw_ostream &OS) { +void EmitRVVBuiltinCG(const RecordKeeper &Records, raw_ostream &OS) { RVVEmitter(Records).createCodeGen(OS); } -void EmitRVVBuiltinSema(RecordKeeper &Records, raw_ostream &OS) { +void EmitRVVBuiltinSema(const RecordKeeper &Records, raw_ostream &OS) { RVVEmitter(Records).createSema(OS); } diff --git a/clang/utils/TableGen/TableGenBackends.h b/clang/utils/TableGen/TableGenBackends.h index 01d16d2dc3e5f1..0d09493365a96a 100644 --- a/clang/utils/TableGen/TableGenBackends.h +++ b/clang/utils/TableGen/TableGenBackends.h @@ -141,10 +141,11 @@ void EmitMveBuiltinSema(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); void EmitMveBuiltinCG(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); void EmitMveBuiltinAliases(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); -void EmitRVVHeader(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); -void EmitRVVBuiltins(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); -void EmitRVVBuiltinCG(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); -void EmitRVVBuiltinSema(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitRVVHeader(const llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitRVVBuiltins(const llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitRVVBuiltinCG(const llvm::RecordKeeper &Records, llvm::raw_ostream &OS); +void EmitRVVBuiltinSema(const llvm::RecordKeeper &Records, + llvm::raw_ostream &OS); void EmitCdeHeader(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); void EmitCdeBuiltinDef(llvm::RecordKeeper &Records, llvm::raw_ostream &OS); `````````` </details> https://github.com/llvm/llvm-project/pull/108502 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
