ScalarConstantsAreLegal -> AllowScalarConstants and Rebase

Author: davemgreen

llvm/include/llvm/CodeGen/GlobalISel/CombinerHelper.h

@@ -640,7 +640,7 @@ class CombinerHelper {
   /// This variant does not erase \p MI after calling the build function.
   void applyBuildFnNoErase(MachineInstr &MI, BuildFnTy &MatchInfo) const;
 
-  bool matchOrShiftToFunnelShift(MachineInstr &MI, bool ScalarConstantsAreLegal,
+  bool matchOrShiftToFunnelShift(MachineInstr &MI, bool AllowScalarConstants,
                                  BuildFnTy &MatchInfo) const;
   bool matchFunnelShiftToRotate(MachineInstr &MI) const;
   void applyFunnelShiftToRotate(MachineInstr &MI) const;

llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp

@@ -4425,7 +4425,7 @@ void CombinerHelper::applyBuildFnNoErase(
 }
 
 bool CombinerHelper::matchOrShiftToFunnelShift(MachineInstr &MI,
-                                               bool ScalarConstantsAreLegal,
+                                               bool AllowScalarConstants,
                                                BuildFnTy &MatchInfo) const {
   assert(MI.getOpcode() == TargetOpcode::G_OR);
 
@@ -4467,7 +4467,7 @@ bool CombinerHelper::matchOrShiftToFunnelShift(MachineInstr &MI,
 
   LLT AmtTy = MRI.getType(Amt);
   if (!isLegalOrBeforeLegalizer({FshOpc, {Ty, AmtTy}}) &&
-      (!ScalarConstantsAreLegal || CstShlAmt == 0 || !Ty.isScalar()))
+      (!AllowScalarConstants || CstShlAmt == 0 || !Ty.isScalar()))
     return false;
 
   MatchInfo = [=](MachineIRBuilder &B) {