@@ -2479,14 +2479,15 @@ bool NVPTXDAGToDAGISel::SelectDirectAddr(SDValue N, SDValue &Address) {
2479
2479
}
2480
2480
2481
2481
// symbol+offset
2482
- bool NVPTXDAGToDAGISel::SelectADDRsi_imp (
2483
- SDNode *OpNode, SDValue Addr, SDValue &Base, SDValue &Offset, MVT mvt) {
2482
+ bool NVPTXDAGToDAGISel::SelectADDRsi_imp (SDNode *OpNode, SDValue Addr,
2483
+ SDValue &Base, SDValue &Offset,
2484
+ MVT VT) {
2484
2485
if (isAddLike (Addr)) {
2485
2486
if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Addr.getOperand (1 ))) {
2486
2487
SDValue base = Addr.getOperand (0 );
2487
2488
if (SelectDirectAddr (base, Base)) {
2488
- Offset = CurDAG-> getTargetConstant (CN-> getZExtValue (), SDLoc (OpNode),
2489
- mvt );
2489
+ Offset =
2490
+ CurDAG-> getTargetConstant (CN-> getZExtValue (), SDLoc (OpNode), VT );
2490
2491
return true ;
2491
2492
}
2492
2493
}
@@ -2507,11 +2508,12 @@ bool NVPTXDAGToDAGISel::SelectADDRsi64(SDNode *OpNode, SDValue Addr,
2507
2508
}
2508
2509
2509
2510
// register+offset
2510
- bool NVPTXDAGToDAGISel::SelectADDRri_imp (
2511
- SDNode *OpNode, SDValue Addr, SDValue &Base, SDValue &Offset, MVT mvt) {
2511
+ bool NVPTXDAGToDAGISel::SelectADDRri_imp (SDNode *OpNode, SDValue Addr,
2512
+ SDValue &Base, SDValue &Offset,
2513
+ MVT VT) {
2512
2514
if (FrameIndexSDNode *FIN = dyn_cast<FrameIndexSDNode>(Addr)) {
2513
- Base = CurDAG->getTargetFrameIndex (FIN->getIndex (), mvt );
2514
- Offset = CurDAG->getTargetConstant (0 , SDLoc (OpNode), mvt );
2515
+ Base = CurDAG->getTargetFrameIndex (FIN->getIndex (), VT );
2516
+ Offset = CurDAG->getTargetConstant (0 , SDLoc (OpNode), VT );
2515
2517
return true ;
2516
2518
}
2517
2519
if (Addr.getOpcode () == ISD::TargetExternalSymbol ||
@@ -2526,7 +2528,7 @@ bool NVPTXDAGToDAGISel::SelectADDRri_imp(
2526
2528
if (FrameIndexSDNode *FIN =
2527
2529
dyn_cast<FrameIndexSDNode>(Addr.getOperand (0 )))
2528
2530
// Constant offset from frame ref.
2529
- Base = CurDAG->getTargetFrameIndex (FIN->getIndex (), mvt );
2531
+ Base = CurDAG->getTargetFrameIndex (FIN->getIndex (), VT );
2530
2532
else
2531
2533
Base = Addr.getOperand (0 );
2532
2534
0 commit comments