[X86][NewPM] Cleanup some minor issues in recently ported passes

boomanaiden154 · boomanaiden154 · commit ea3a965eb192 · 2026-01-17T20:27:34.000Z
* Ensure passes implemented as single functions are marked as static to
  enforce internal linkage.
* Avoid the use of temporary variables to hold pass output status that
  only have one user/do not change any ordering guarantees.
diff --git a/llvm/lib/Target/X86/X86LoadValueInjectionRetHardening.cpp b/llvm/lib/Target/X86/X86LoadValueInjectionRetHardening.cpp
@@ -56,7 +56,7 @@ class X86LoadValueInjectionRetHardeningLegacy : public MachineFunctionPass {
 
 char X86LoadValueInjectionRetHardeningLegacy::ID = 0;
 
-bool runX86LoadValueInjectionRetHardening(MachineFunction &MF) {
+static bool runX86LoadValueInjectionRetHardening(MachineFunction &MF) {
   const X86Subtarget *Subtarget = &MF.getSubtarget<X86Subtarget>();
   if (!Subtarget->useLVIControlFlowIntegrity() || !Subtarget->is64Bit())
     return false; // FIXME: support 32-bit
@@ -119,10 +119,10 @@ bool X86LoadValueInjectionRetHardeningLegacy::runOnMachineFunction(
 
 PreservedAnalyses X86LoadValueInjectionRetHardeningPass::run(
     MachineFunction &MF, MachineFunctionAnalysisManager &MFAM) {
-  const bool Modified = runX86LoadValueInjectionRetHardening(MF);
-  return Modified ? getMachineFunctionPassPreservedAnalyses()
-                        .preserveSet<CFGAnalyses>()
-                  : PreservedAnalyses::all();
+  return runX86LoadValueInjectionRetHardening(MF)
+             ? getMachineFunctionPassPreservedAnalyses()
+                   .preserveSet<CFGAnalyses>()
+             : PreservedAnalyses::all();
 }
 
 INITIALIZE_PASS(X86LoadValueInjectionRetHardeningLegacy, PASS_KEY,
diff --git a/llvm/lib/Target/X86/X86ReturnThunks.cpp b/llvm/lib/Target/X86/X86ReturnThunks.cpp
@@ -57,7 +57,7 @@ struct X86ReturnThunksLegacy final : public MachineFunctionPass {
 
 char X86ReturnThunksLegacy::ID = 0;
 
-bool runX86ReturnThunks(MachineFunction &MF) {
+static bool runX86ReturnThunks(MachineFunction &MF) {
   LLVM_DEBUG(dbgs() << X86ReturnThunksPassName << "\n");
 
   bool Modified = false;
@@ -103,10 +103,9 @@ bool X86ReturnThunksLegacy::runOnMachineFunction(MachineFunction &MF) {
 PreservedAnalyses
 X86ReturnThunksPass::run(MachineFunction &MF,
                          MachineFunctionAnalysisManager &MFAM) {
-  const bool Modified = runX86ReturnThunks(MF);
-  return Modified ? getMachineFunctionPassPreservedAnalyses()
-                        .preserveSet<CFGAnalyses>()
-                  : PreservedAnalyses::all();
+  return runX86ReturnThunks(MF) ? getMachineFunctionPassPreservedAnalyses()
+                                      .preserveSet<CFGAnalyses>()
+                                : PreservedAnalyses::all();
 }
 
 INITIALIZE_PASS(X86ReturnThunksLegacy, PASS_KEY, "X86 Return Thunks", false,
diff --git a/llvm/lib/Target/X86/X86SpeculativeExecutionSideEffectSuppression.cpp b/llvm/lib/Target/X86/X86SpeculativeExecutionSideEffectSuppression.cpp
@@ -87,7 +87,8 @@ static bool hasConstantAddressingMode(const MachineInstr &MI) {
   return true;
 }
 
-bool runX86SpeculativeExecutionSideEffectSuppression(MachineFunction &MF) {
+static bool
+runX86SpeculativeExecutionSideEffectSuppression(MachineFunction &MF) {
 
   const auto &OptLevel = MF.getTarget().getOptLevel();
   const X86Subtarget &Subtarget = MF.getSubtarget<X86Subtarget>();

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ static bool hasConstantAddressingMode(const MachineInstr &MI) {`
`87`	`87`	`return true;`
`88`	`88`	`}`
`89`	`89`
`90`		`-bool runX86SpeculativeExecutionSideEffectSuppression(MachineFunction &MF) {`
	`90`	`+static bool`
	`91`	`+runX86SpeculativeExecutionSideEffectSuppression(MachineFunction &MF) {`
`91`	`92`
`92`	`93`	`const auto &OptLevel = MF.getTarget().getOptLevel();`
`93`	`94`	`const X86Subtarget &Subtarget = MF.getSubtarget<X86Subtarget>();`