@@ -2688,8 +2688,7 @@ ARMTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
2688
2688
unsigned RegBegin, RegEnd;
2689
2689
CCInfo.getInRegsParamInfo(CurByValIdx, RegBegin, RegEnd);
2690
2690
2691
- EVT PtrVT =
2692
- DAG.getTargetLoweringInfo().getPointerTy(DAG.getDataLayout());
2691
+ EVT PtrVT = getPointerTy(DAG.getDataLayout());
2693
2692
unsigned int i, j;
2694
2693
for (i = 0, j = RegBegin; j < RegEnd; i++, j++) {
2695
2694
SDValue Const = DAG.getConstant(4*i, dl, MVT::i32);
@@ -5024,7 +5023,7 @@ ARMTargetLowering::getARMXALUOOp(SDValue Op, SelectionDAG &DAG,
5024
5023
SDValue
5025
5024
ARMTargetLowering::LowerSignedALUO(SDValue Op, SelectionDAG &DAG) const {
5026
5025
// Let legalize expand this if it isn't a legal type yet.
5027
- if (!DAG.getTargetLoweringInfo(). isTypeLegal(Op.getValueType()))
5026
+ if (!isTypeLegal(Op.getValueType()))
5028
5027
return SDValue();
5029
5028
5030
5029
SDValue Value, OverflowCmp;
@@ -5070,7 +5069,7 @@ static SDValue ConvertCarryFlagToBooleanCarry(SDValue Flags, EVT VT,
5070
5069
SDValue ARMTargetLowering::LowerUnsignedALUO(SDValue Op,
5071
5070
SelectionDAG &DAG) const {
5072
5071
// Let legalize expand this if it isn't a legal type yet.
5073
- if (!DAG.getTargetLoweringInfo(). isTypeLegal(Op.getValueType()))
5072
+ if (!isTypeLegal(Op.getValueType()))
5074
5073
return SDValue();
5075
5074
5076
5075
SDValue LHS = Op.getOperand(0);
@@ -5168,7 +5167,7 @@ SDValue ARMTargetLowering::LowerSELECT(SDValue Op, SelectionDAG &DAG) const {
5168
5167
if (Cond.getResNo() == 1 &&
5169
5168
(Opc == ISD::SADDO || Opc == ISD::UADDO || Opc == ISD::SSUBO ||
5170
5169
Opc == ISD::USUBO)) {
5171
- if (!DAG.getTargetLoweringInfo(). isTypeLegal(Cond->getValueType(0)))
5170
+ if (!isTypeLegal(Cond->getValueType(0)))
5172
5171
return SDValue();
5173
5172
5174
5173
SDValue Value, OverflowCmp;
@@ -5530,8 +5529,7 @@ SDValue ARMTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
5530
5529
}
5531
5530
5532
5531
if (isUnsupportedFloatingType(LHS.getValueType())) {
5533
- DAG.getTargetLoweringInfo().softenSetCCOperands(
5534
- DAG, LHS.getValueType(), LHS, RHS, CC, dl, LHS, RHS);
5532
+ softenSetCCOperands(DAG, LHS.getValueType(), LHS, RHS, CC, dl, LHS, RHS);
5535
5533
5536
5534
// If softenSetCCOperands only returned one value, we should compare it to
5537
5535
// zero.
@@ -5736,7 +5734,7 @@ SDValue ARMTargetLowering::LowerBRCOND(SDValue Op, SelectionDAG &DAG) const {
5736
5734
(Opc == ISD::SADDO || Opc == ISD::UADDO || Opc == ISD::SSUBO ||
5737
5735
Opc == ISD::USUBO || OptimizeMul)) {
5738
5736
// Only lower legal XALUO ops.
5739
- if (!DAG.getTargetLoweringInfo(). isTypeLegal(Cond->getValueType(0)))
5737
+ if (!isTypeLegal(Cond->getValueType(0)))
5740
5738
return SDValue();
5741
5739
5742
5740
// The actual operation with overflow check.
@@ -5766,8 +5764,7 @@ SDValue ARMTargetLowering::LowerBR_CC(SDValue Op, SelectionDAG &DAG) const {
5766
5764
SDLoc dl(Op);
5767
5765
5768
5766
if (isUnsupportedFloatingType(LHS.getValueType())) {
5769
- DAG.getTargetLoweringInfo().softenSetCCOperands(
5770
- DAG, LHS.getValueType(), LHS, RHS, CC, dl, LHS, RHS);
5767
+ softenSetCCOperands(DAG, LHS.getValueType(), LHS, RHS, CC, dl, LHS, RHS);
5771
5768
5772
5769
// If softenSetCCOperands only returned one value, we should compare it to
5773
5770
// zero.
@@ -5787,7 +5784,7 @@ SDValue ARMTargetLowering::LowerBR_CC(SDValue Op, SelectionDAG &DAG) const {
5787
5784
Opc == ISD::USUBO || OptimizeMul) &&
5788
5785
(CC == ISD::SETEQ || CC == ISD::SETNE)) {
5789
5786
// Only lower legal XALUO ops.
5790
- if (!DAG.getTargetLoweringInfo(). isTypeLegal(LHS->getValueType(0)))
5787
+ if (!isTypeLegal(LHS->getValueType(0)))
5791
5788
return SDValue();
5792
5789
5793
5790
// The actual operation with overflow check.
@@ -6255,7 +6252,6 @@ static SDValue CombineVMOVDRRCandidateWithVecOp(const SDNode *BC,
6255
6252
/// vectors), since the legalizer won't know what to do with that.
6256
6253
SDValue ARMTargetLowering::ExpandBITCAST(SDNode *N, SelectionDAG &DAG,
6257
6254
const ARMSubtarget *Subtarget) const {
6258
- const TargetLowering &TLI = DAG.getTargetLoweringInfo();
6259
6255
SDLoc dl(N);
6260
6256
SDValue Op = N->getOperand(0);
6261
6257
@@ -6282,7 +6278,7 @@ SDValue ARMTargetLowering::ExpandBITCAST(SDNode *N, SelectionDAG &DAG,
6282
6278
return SDValue();
6283
6279
6284
6280
// Turn i64->f64 into VMOVDRR.
6285
- if (SrcVT == MVT::i64 && TLI. isTypeLegal(DstVT)) {
6281
+ if (SrcVT == MVT::i64 && isTypeLegal(DstVT)) {
6286
6282
// Do not force values to GPRs (this is what VMOVDRR does for the inputs)
6287
6283
// if we can combine the bitcast with its source.
6288
6284
if (SDValue Val = CombineVMOVDRRCandidateWithVecOp(N, DAG))
@@ -6294,7 +6290,7 @@ SDValue ARMTargetLowering::ExpandBITCAST(SDNode *N, SelectionDAG &DAG,
6294
6290
}
6295
6291
6296
6292
// Turn f64->i64 into VMOVRRD.
6297
- if (DstVT == MVT::i64 && TLI. isTypeLegal(SrcVT)) {
6293
+ if (DstVT == MVT::i64 && isTypeLegal(SrcVT)) {
6298
6294
SDValue Cvt;
6299
6295
if (DAG.getDataLayout().isBigEndian() && SrcVT.isVector() &&
6300
6296
SrcVT.getVectorNumElements() > 1)
@@ -9931,7 +9927,6 @@ SDValue ARMTargetLowering::LowerFSINCOS(SDValue Op, SelectionDAG &DAG) const {
9931
9927
auto PtrVT = getPointerTy(DAG.getDataLayout());
9932
9928
9933
9929
MachineFrameInfo &MFI = DAG.getMachineFunction().getFrameInfo();
9934
- const TargetLowering &TLI = DAG.getTargetLoweringInfo();
9935
9930
9936
9931
// Pair of floats / doubles used to pass the result.
9937
9932
Type *RetTy = StructType::get(ArgTy, ArgTy);
@@ -9945,7 +9940,7 @@ SDValue ARMTargetLowering::LowerFSINCOS(SDValue Op, SelectionDAG &DAG) const {
9945
9940
const uint64_t ByteSize = DL.getTypeAllocSize(RetTy);
9946
9941
const Align StackAlign = DL.getPrefTypeAlign(RetTy);
9947
9942
int FrameIdx = MFI.CreateStackObject(ByteSize, StackAlign, false);
9948
- SRet = DAG.getFrameIndex(FrameIdx, TLI. getPointerTy(DL));
9943
+ SRet = DAG.getFrameIndex(FrameIdx, getPointerTy(DL));
9949
9944
9950
9945
ArgListEntry Entry;
9951
9946
Entry.Node = SRet;
@@ -10003,15 +9998,14 @@ SDValue ARMTargetLowering::LowerWindowsDIVLibCall(SDValue Op, SelectionDAG &DAG,
10003
9998
SDLoc dl(Op);
10004
9999
10005
10000
const auto &DL = DAG.getDataLayout();
10006
- const auto &TLI = DAG.getTargetLoweringInfo();
10007
10001
10008
10002
const char *Name = nullptr;
10009
10003
if (Signed)
10010
10004
Name = (VT == MVT::i32) ? "__rt_sdiv" : "__rt_sdiv64";
10011
10005
else
10012
10006
Name = (VT == MVT::i32) ? "__rt_udiv" : "__rt_udiv64";
10013
10007
10014
- SDValue ES = DAG.getExternalSymbol(Name, TLI. getPointerTy(DL));
10008
+ SDValue ES = DAG.getExternalSymbol(Name, getPointerTy(DL));
10015
10009
10016
10010
ARMTargetLowering::ArgListTy Args;
10017
10011
@@ -10101,7 +10095,6 @@ void ARMTargetLowering::ExpandDIV_Windows(
10101
10095
SDValue Op, SelectionDAG &DAG, bool Signed,
10102
10096
SmallVectorImpl<SDValue> &Results) const {
10103
10097
const auto &DL = DAG.getDataLayout();
10104
- const auto &TLI = DAG.getTargetLoweringInfo();
10105
10098
10106
10099
assert(Op.getValueType() == MVT::i64 &&
10107
10100
"unexpected type for custom lowering DIV");
@@ -10113,7 +10106,7 @@ void ARMTargetLowering::ExpandDIV_Windows(
10113
10106
10114
10107
SDValue Lower = DAG.getNode(ISD::TRUNCATE, dl, MVT::i32, Result);
10115
10108
SDValue Upper = DAG.getNode(ISD::SRL, dl, MVT::i64, Result,
10116
- DAG.getConstant(32, dl, TLI. getPointerTy(DL)));
10109
+ DAG.getConstant(32, dl, getPointerTy(DL)));
10117
10110
Upper = DAG.getNode(ISD::TRUNCATE, dl, MVT::i32, Upper);
10118
10111
10119
10112
Results.push_back(DAG.getNode(ISD::BUILD_PAIR, dl, MVT::i64, Lower, Upper));
@@ -10525,8 +10518,8 @@ SDValue ARMTargetLowering::LowerFSETCC(SDValue Op, SelectionDAG &DAG) const {
10525
10518
// If we don't have instructions of this float type then soften to a libcall
10526
10519
// and use SETCC instead.
10527
10520
if (isUnsupportedFloatingType(LHS.getValueType())) {
10528
- DAG.getTargetLoweringInfo().softenSetCCOperands(
10529
- DAG, LHS.getValueType(), LHS, RHS, CC, dl, LHS, RHS, Chain, IsSignaling);
10521
+ softenSetCCOperands( DAG, LHS.getValueType(), LHS, RHS, CC, dl, LHS, RHS,
10522
+ Chain, IsSignaling);
10530
10523
if (!RHS.getNode()) {
10531
10524
RHS = DAG.getConstant(0, dl, LHS.getValueType());
10532
10525
CC = ISD::SETNE;
0 commit comments