fix GlobalISEL

Author: adriweb

llvm/include/llvm/CodeGen/GlobalISel/CallLowering.h

@@ -19,6 +19,7 @@
 #include "llvm/CodeGen/CallingConvLower.h"
 #include "llvm/CodeGen/MachineOperand.h"
 #include "llvm/CodeGen/TargetCallingConv.h"
+#include "llvm/IR/Attributes.h"
 #include "llvm/IR/CallingConv.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/Value.h"
@@ -30,7 +31,6 @@
 
 namespace llvm {
 
-class AttributeList;
 class CallBase;
 class DataLayout;
 class Function;

llvm/include/llvm/CodeGen/GlobalISel/MIPatternMatch.h

@@ -163,6 +163,9 @@ struct GCstAndRegMatch {
   bool match(const MachineRegisterInfo &MRI, Register Reg) {
     ValReg = getIConstantVRegValWithLookThrough(Reg, MRI);
     return ValReg ? true : false;
+  }
+};
+
 template <typename ConstT> inline ConstantMatch<ConstT> m_ICst(ConstT &Cst) {
   return {Cst};
 }

llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp

@@ -5757,7 +5757,7 @@ bool CombinerHelper::applyPtrAddGlobalImmed(
   Observer.changingInstr(MI);
   MI.setDesc(Builder.getTII().get(TargetOpcode::G_GLOBAL_VALUE));
   MI.getOperand(1).ChangeToGA(MatchInfo.first, MatchInfo.second);
-  MI.RemoveOperand(2);
+  MI.removeOperand(2);
   Observer.changedInstr(MI);
   return true;
 }
@@ -5801,7 +5801,7 @@ bool CombinerHelper::applyPtrAddConstImmed(MachineInstr &MI,
   Observer.changingInstr(MI);
   MI.setDesc(Builder.getTII().get(TargetOpcode::G_INTTOPTR));
   MI.getOperand(1).setReg(NewConst.getReg(0));
-  MI.RemoveOperand(2);
+  MI.removeOperand(2);
   Observer.changedInstr(MI);
   return true;
 }
@@ -6021,7 +6021,7 @@ bool CombinerHelper::applyCombineIdentity(MachineInstr &MI) {
   Builder.setInstrAndDebugLoc(MI);
   Observer.changingInstr(MI);
   MI.setDesc(Builder.getTII().get(TargetOpcode::COPY));
-  MI.RemoveOperand(2);
+  MI.removeOperand(2);
   Observer.changedInstr(MI);
   return true;
 }

llvm/utils/TableGen/GlobalISelEmitter.cpp

@@ -2258,7 +2258,7 @@ class NoUsePredicateMatcher : public InstructionPredicateMatcher {
   }
 
   void emitPredicateOpcodes(MatchTable &Table,
-                            RuleMatcher &Rule) const override {
+                            Matcher &Rule) const override {
     Table << MatchTable::Opcode("GIM_CheckHasNoUse")
           << MatchTable::Comment("MI") << MatchTable::IntValue(InsnVarID)
           << MatchTable::LineBreak;