From 293c6d382128a0e52a144cec901932d71e072760 Mon Sep 17 00:00:00 2001 From: Alexey Lapshin Date: Wed, 13 May 2020 01:10:32 +0300 Subject: [PATCH] Fix buildbots after aa1eb5152d9a5bd588c8479a376fa65cbeabbc9f. --- llvm/lib/Target/X86/X86ISelLowering.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 369b01d..040e946 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -3337,9 +3337,9 @@ public: SelectionDAG &DAG, const X86Subtarget &Subtarget, CallingConv::ID CallConv, CCState &CCInfo) : FuncInfo(FuncInfo), DL(Loc), DAG(DAG), Subtarget(Subtarget), - MachineFunction(DAG.getMachineFunction()), - Function(MachineFunction.getFunction()), - FrameInfo(MachineFunction.getFrameInfo()), + TheMachineFunction(DAG.getMachineFunction()), + Function(TheMachineFunction.getFunction()), + FrameInfo(TheMachineFunction.getFrameInfo()), FrameLowering(*Subtarget.getFrameLowering()), TargLowering(DAG.getTargetLoweringInfo()), CallConv(CallConv), CCInfo(CCInfo) {} @@ -3359,7 +3359,7 @@ private: const SDLoc &DL; SelectionDAG &DAG; const X86Subtarget &Subtarget; - MachineFunction &MachineFunction; + MachineFunction &TheMachineFunction; const Function &Function; MachineFrameInfo &FrameInfo; const TargetFrameLowering &FrameLowering; @@ -3390,7 +3390,7 @@ void VarArgsLoweringHelper::createVarArgAreaAndStoreRegisters( // Find the first unallocated argument registers. ArrayRef ArgGPRs = get64BitArgumentGPRs(CallConv, Subtarget); ArrayRef ArgXMMs = - get64BitArgumentXMMs(MachineFunction, CallConv, Subtarget); + get64BitArgumentXMMs(TheMachineFunction, CallConv, Subtarget); unsigned NumIntRegs = CCInfo.getFirstUnallocated(ArgGPRs); unsigned NumXMMRegs = CCInfo.getFirstUnallocated(ArgXMMs); @@ -3424,15 +3424,15 @@ void VarArgsLoweringHelper::createVarArgAreaAndStoreRegisters( // Gather all the live in physical registers. for (MCPhysReg Reg : ArgGPRs.slice(NumIntRegs)) { - unsigned GPR = MachineFunction.addLiveIn(Reg, &X86::GR64RegClass); + unsigned GPR = TheMachineFunction.addLiveIn(Reg, &X86::GR64RegClass); LiveGPRs.push_back(DAG.getCopyFromReg(Chain, DL, GPR, MVT::i64)); } const auto &AvailableXmms = ArgXMMs.slice(NumXMMRegs); if (!AvailableXmms.empty()) { - unsigned AL = MachineFunction.addLiveIn(X86::AL, &X86::GR8RegClass); + unsigned AL = TheMachineFunction.addLiveIn(X86::AL, &X86::GR8RegClass); ALVal = DAG.getCopyFromReg(Chain, DL, AL, MVT::i8); for (MCPhysReg Reg : AvailableXmms) { - unsigned XMMReg = MachineFunction.addLiveIn(Reg, &X86::VR128RegClass); + unsigned XMMReg = TheMachineFunction.addLiveIn(Reg, &X86::VR128RegClass); LiveXMMRegs.push_back( DAG.getCopyFromReg(Chain, DL, XMMReg, MVT::v4f32)); } @@ -3504,7 +3504,7 @@ void VarArgsLoweringHelper::forwardMustTailParameters(SDValue &Chain) { // Forward AL for SysV x86_64 targets, since it is used for varargs. if (is64Bit() && !isWin64() && !CCInfo.isAllocated(X86::AL)) { - unsigned ALVReg = MachineFunction.addLiveIn(X86::AL, &X86::GR8RegClass); + unsigned ALVReg = TheMachineFunction.addLiveIn(X86::AL, &X86::GR8RegClass); Forwards.push_back(ForwardedRegister(ALVReg, X86::AL, MVT::i8)); } @@ -3512,7 +3512,7 @@ void VarArgsLoweringHelper::forwardMustTailParameters(SDValue &Chain) { for (ForwardedRegister &FR : Forwards) { // FIXME: Can we use a less constrained schedule? SDValue RegVal = DAG.getCopyFromReg(Chain, DL, FR.VReg, FR.VT); - FR.VReg = MachineFunction.getRegInfo().createVirtualRegister( + FR.VReg = TheMachineFunction.getRegInfo().createVirtualRegister( TargLowering.getRegClassFor(FR.VT)); Chain = DAG.getCopyToReg(Chain, DL, FR.VReg, RegVal); } -- 2.7.4