@@ -5232,8 +5232,8 @@ static SDValue EmitTailCallStoreFPAndRetAddr(SelectionDAG &DAG, SDValue Chain,
52325232 int NewRetAddrLoc = SPDiff + FL->getReturnSaveOffset();
52335233 int NewRetAddr = MF.getFrameInfo().CreateFixedObject(SlotSize,
52345234 NewRetAddrLoc, true);
5235- EVT VT = Subtarget.getScalarIntVT();
5236- SDValue NewRetAddrFrIdx = DAG.getFrameIndex(NewRetAddr, VT );
5235+ SDValue NewRetAddrFrIdx =
5236+ DAG.getFrameIndex(NewRetAddr, Subtarget.getScalarIntVT() );
52375237 Chain = DAG.getStore(Chain, dl, OldRetAddr, NewRetAddrFrIdx,
52385238 MachinePointerInfo::getFixedStack(MF, NewRetAddr));
52395239 }
@@ -5243,13 +5243,12 @@ static SDValue EmitTailCallStoreFPAndRetAddr(SelectionDAG &DAG, SDValue Chain,
52435243/// CalculateTailCallArgDest - Remember Argument for later processing. Calculate
52445244/// the position of the argument.
52455245static void CalculateTailCallArgDest(
5246- SelectionDAG &DAG, MachineFunction &MF, bool IsPPC64 , SDValue Arg,
5247- int SPDiff, unsigned ArgOffset,
5246+ SelectionDAG &DAG, MachineFunction &MF, EVT VT , SDValue Arg, int SPDiff ,
5247+ unsigned ArgOffset,
52485248 SmallVectorImpl<TailCallArgumentInfo> &TailCallArguments) {
52495249 int Offset = ArgOffset + SPDiff;
52505250 uint32_t OpSize = (Arg.getValueSizeInBits() + 7) / 8;
52515251 int FI = MF.getFrameInfo().CreateFixedObject(OpSize, Offset, true);
5252- EVT VT = IsPPC64 ? MVT::i64 : MVT::i32;
52535252 SDValue FIN = DAG.getFrameIndex(FI, VT);
52545253 TailCallArgumentInfo Info;
52555254 Info.Arg = Arg;
@@ -5266,9 +5265,9 @@ SDValue PPCTargetLowering::EmitTailCallLoadFPAndRetAddr(
52665265 SDValue &FPOpOut, const SDLoc &dl) const {
52675266 if (SPDiff) {
52685267 // Load the LR and FP stack slot for later adjusting.
5269- EVT VT = Subtarget.getScalarIntVT();
52705268 LROpOut = getReturnAddrFrameIndex(DAG);
5271- LROpOut = DAG.getLoad(VT, dl, Chain, LROpOut, MachinePointerInfo());
5269+ LROpOut = DAG.getLoad(Subtarget.getScalarIntVT(), dl, Chain, LROpOut,
5270+ MachinePointerInfo());
52725271 Chain = SDValue(LROpOut.getNode(), 1);
52735272 }
52745273 return Chain;
@@ -5310,8 +5309,9 @@ static void LowerMemOpCallTo(
53105309 MemOpChains.push_back(
53115310 DAG.getStore(Chain, dl, Arg, PtrOff, MachinePointerInfo()));
53125311 // Calculate and remember argument location.
5313- } else CalculateTailCallArgDest(DAG, MF, isPPC64, Arg, SPDiff, ArgOffset,
5314- TailCallArguments);
5312+ } else
5313+ CalculateTailCallArgDest(DAG, MF, Subtarget.getScalarIntVT(), Arg, SPDiff,
5314+ ArgOffset, TailCallArguments);
53155315}
53165316
53175317static void
@@ -6174,7 +6174,7 @@ SDValue PPCTargetLowering::LowerCall_32SVR4(
61746174 DAG.getStore(Chain, dl, Arg, PtrOff, MachinePointerInfo()));
61756175 } else {
61766176 // Calculate and remember argument location.
6177- CalculateTailCallArgDest(DAG, MF, false , Arg, SPDiff, LocMemOffset,
6177+ CalculateTailCallArgDest(DAG, MF, MVT::i32 , Arg, SPDiff, LocMemOffset,
61786178 TailCallArguments);
61796179 }
61806180 }
@@ -11309,11 +11309,11 @@ SDValue PPCTargetLowering::LowerINTRINSIC_VOID(SDValue Op,
1130911309 Val = DAG.getNode(ISD::TRUNCATE, DL, MVT::i64, Val);
1131011310 }
1131111311 unsigned Opcode = Subtarget.isPPC64() ? PPC::CFENCE8 : PPC::CFENCE;
11312- EVT FTy = Subtarget.getScalarIntVT();
1131311312 return SDValue(
11314- DAG.getMachineNode(Opcode, DL, MVT::Other,
11315- DAG.getNode(ISD::ANY_EXTEND, DL, FTy, Val),
11316- Op.getOperand(0)),
11313+ DAG.getMachineNode(
11314+ Opcode, DL, MVT::Other,
11315+ DAG.getNode(ISD::ANY_EXTEND, DL, Subtarget.getScalarIntVT(), Val),
11316+ Op.getOperand(0)),
1131711317 0);
1131811318 }
1131911319 default:
0 commit comments