[llvm] [TargetLowering] Make optimizeSetCCByHoistingAndByConstFromLogicalShift a static function. NFC (PR #104171)

[Craig Topper via llvm-commits]

https://github.com/topperc created https://github.com/llvm/llvm-project/pull/104171

This isn't called from outside TargetLowering and it called DAG.getTargetLoweringInfo() instead of using 'this'. Make it a free standing function.

I changed DAGCombinerInfo argument to SelectionDAG to avoid needing to write TargetLowering::DAGCombinerInfo.

>From f2b2a26d7a518ebda1a1bda6d6d9539d8d3383eb Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper at sifive.com>
Date: Wed, 14 Aug 2024 11:56:45 -0700
Subject: [PATCH] [TargetLowering] Make
 optimizeSetCCByHoistingAndByConstFromLogicalShift a static function. NFC

This isn't called from outside TargetLowering and it called
DAG.getTargetLoweringInfo() instead of using 'this'. Make it a
free standing function.

I changed DAGCombinerInfo argument to SelectionDAG to avoid
needing to write TargetLowering::DAGCombinerInfo.
---
 llvm/include/llvm/CodeGen/TargetLowering.h       | 5 -----
 llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp | 7 +++----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/llvm/include/llvm/CodeGen/TargetLowering.h b/llvm/include/llvm/CodeGen/TargetLowering.h
index deb1d04df3400c..e9bd0e31fac9f0 100644
--- a/llvm/include/llvm/CodeGen/TargetLowering.h
+++ b/llvm/include/llvm/CodeGen/TargetLowering.h
@@ -5613,11 +5613,6 @@ class TargetLowering : public TargetLoweringBase {
                                                DAGCombinerInfo &DCI,
                                                const SDLoc &DL) const;
 
-  // (X & (C l>>/<< Y)) ==/!= 0  -->  ((X <</l>> Y) & C) ==/!= 0
-  SDValue optimizeSetCCByHoistingAndByConstFromLogicalShift(
-      EVT SCCVT, SDValue N0, SDValue N1C, ISD::CondCode Cond,
-      DAGCombinerInfo &DCI, const SDLoc &DL) const;
-
   SDValue prepareUREMEqFold(EVT SETCCVT, SDValue REMNode,
                             SDValue CompTargetNode, ISD::CondCode Cond,
                             DAGCombinerInfo &DCI, const SDLoc &DL,
diff --git a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
index b5bca5937477be..e29b72bcc32561 100644
--- a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
@@ -4175,9 +4175,9 @@ SDValue TargetLowering::optimizeSetCCOfSignedTruncationCheck(
 }
 
 // (X & (C l>>/<< Y)) ==/!= 0  -->  ((X <</l>> Y) & C) ==/!= 0
-SDValue TargetLowering::optimizeSetCCByHoistingAndByConstFromLogicalShift(
+static SDValue optimizeSetCCByHoistingAndByConstFromLogicalShift(
     EVT SCCVT, SDValue N0, SDValue N1C, ISD::CondCode Cond,
-    DAGCombinerInfo &DCI, const SDLoc &DL) const {
+    SelectionDAG &DAG, const SDLoc &DL) {
   assert(isConstOrConstSplat(N1C) && isConstOrConstSplat(N1C)->isZero() &&
          "Should be a comparison with 0.");
   assert((Cond == ISD::SETEQ || Cond == ISD::SETNE) &&
@@ -4186,7 +4186,6 @@ SDValue TargetLowering::optimizeSetCCByHoistingAndByConstFromLogicalShift(
   unsigned NewShiftOpcode;
   SDValue X, C, Y;
 
-  SelectionDAG &DAG = DCI.DAG;
   const TargetLowering &TLI = DAG.getTargetLoweringInfo();
 
   // Look for '(C l>>/<< Y)'.
@@ -5024,7 +5023,7 @@ SDValue TargetLowering::SimplifySetCC(EVT VT, SDValue N0, SDValue N1,
       // (X & (C l>>/<< Y)) ==/!= 0  -->  ((X <</l>> Y) & C) ==/!= 0
       if (C1.isZero())
         if (SDValue CC = optimizeSetCCByHoistingAndByConstFromLogicalShift(
-                VT, N0, N1, Cond, DCI, dl))
+                VT, N0, N1, Cond, DAG, dl))
           return CC;
 
       // For all/any comparisons, replace or(x,shl(y,bw/2)) with and/or(x,y).