[llvm] c86dbf2 - [RISCV][NFC] Avoid PassPass in RISCVCodeGenPrepare (#218081)

[via llvm-commits]

Author: Sam Elliott
Date: 2026-08-21T23:51:48-07:00
New Revision: c86dbf2c39172cec974f5fb0245e63f214db0b43

URL: https://github.com/llvm/llvm-project/commit/c86dbf2c39172cec974f5fb0245e63f214db0b43
DIFF: https://github.com/llvm/llvm-project/commit/c86dbf2c39172cec974f5fb0245e63f214db0b43.diff

LOG: [RISCV][NFC] Avoid PassPass in RISCVCodeGenPrepare (#218081)

Added: 
    

Modified: 
    llvm/lib/Target/RISCV/RISCV.h
    llvm/lib/Target/RISCV/RISCVCodeGenPrepare.cpp
    llvm/lib/Target/RISCV/RISCVTargetMachine.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/RISCV/RISCV.h b/llvm/lib/Target/RISCV/RISCV.h
index ecc459eb02a7e..6488c704669af 100644
--- a/llvm/lib/Target/RISCV/RISCV.h
+++ b/llvm/lib/Target/RISCV/RISCV.h
@@ -37,7 +37,7 @@ class RISCVCodeGenPreparePass
   PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
 };
 FunctionPass *createRISCVCodeGenPrepareLegacyPass();
-void initializeRISCVCodeGenPrepareLegacyPassPass(PassRegistry &);
+void initializeRISCVCodeGenPrepareLegacyPass(PassRegistry &);
 
 FunctionPass *createRISCVDeadRegisterDefinitionsPass();
 void initializeRISCVDeadRegisterDefinitionsPass(PassRegistry &);

diff  --git a/llvm/lib/Target/RISCV/RISCVCodeGenPrepare.cpp b/llvm/lib/Target/RISCV/RISCVCodeGenPrepare.cpp
index 8f5180dd90278..dbb9811f615c7 100644
--- a/llvm/lib/Target/RISCV/RISCVCodeGenPrepare.cpp
+++ b/llvm/lib/Target/RISCV/RISCVCodeGenPrepare.cpp
@@ -57,11 +57,11 @@ class RISCVCodeGenPrepareImpl
 } // namespace
 
 namespace {
-class RISCVCodeGenPrepareLegacyPass : public FunctionPass {
+class RISCVCodeGenPrepareLegacy : public FunctionPass {
 public:
   static char ID;
 
-  RISCVCodeGenPrepareLegacyPass() : FunctionPass(ID) {}
+  RISCVCodeGenPrepareLegacy() : FunctionPass(ID) {}
 
   bool runOnFunction(Function &F) override;
   StringRef getPassName() const override { return PASS_NAME; }
@@ -420,7 +420,7 @@ bool RISCVCodeGenPrepareImpl::run() {
   return MadeChange;
 }
 
-bool RISCVCodeGenPrepareLegacyPass::runOnFunction(Function &F) {
+bool RISCVCodeGenPrepareLegacy::runOnFunction(Function &F) {
   if (skipFunction(F))
     return false;
 
@@ -433,16 +433,16 @@ bool RISCVCodeGenPrepareLegacyPass::runOnFunction(Function &F) {
   return RVCGP.run();
 }
 
-INITIALIZE_PASS_BEGIN(RISCVCodeGenPrepareLegacyPass, DEBUG_TYPE, PASS_NAME,
-                      false, false)
+INITIALIZE_PASS_BEGIN(RISCVCodeGenPrepareLegacy, DEBUG_TYPE, PASS_NAME, false,
+                      false)
 INITIALIZE_PASS_DEPENDENCY(TargetPassConfig)
-INITIALIZE_PASS_END(RISCVCodeGenPrepareLegacyPass, DEBUG_TYPE, PASS_NAME, false,
+INITIALIZE_PASS_END(RISCVCodeGenPrepareLegacy, DEBUG_TYPE, PASS_NAME, false,
                     false)
 
-char RISCVCodeGenPrepareLegacyPass::ID = 0;
+char RISCVCodeGenPrepareLegacy::ID = 0;
 
 FunctionPass *llvm::createRISCVCodeGenPrepareLegacyPass() {
-  return new RISCVCodeGenPrepareLegacyPass();
+  return new RISCVCodeGenPrepareLegacy();
 }
 
 PreservedAnalyses RISCVCodeGenPreparePass::run(Function &F,

diff  --git a/llvm/lib/Target/RISCV/RISCVTargetMachine.cpp b/llvm/lib/Target/RISCV/RISCVTargetMachine.cpp
index 9886d703eaed4..0db4e48a2114f 100644
--- a/llvm/lib/Target/RISCV/RISCVTargetMachine.cpp
+++ b/llvm/lib/Target/RISCV/RISCVTargetMachine.cpp
@@ -128,7 +128,7 @@ extern "C" LLVM_ABI LLVM_EXTERNAL_VISIBILITY void LLVMInitializeRISCVTarget() {
   initializeRISCVMakeCompressibleOptPass(*PR);
   initializeRISCVQCRelaxMarkingPass(*PR);
   initializeRISCVGatherScatterLoweringLegacyPass(*PR);
-  initializeRISCVCodeGenPrepareLegacyPassPass(*PR);
+  initializeRISCVCodeGenPrepareLegacyPass(*PR);
   initializeRISCVZacasABIFixLegacyPass(*PR);
   initializeRISCVPostRAExpandPseudoPass(*PR);
   initializeRISCVMergeBaseOffsetOptPass(*PR);