@@ -2479,14 +2479,15 @@ bool NVPTXDAGToDAGISel::SelectDirectAddr(SDValue N, SDValue &Address) {
24792479}
24802480
24812481// 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) {
24842485 if (isAddLike (Addr)) {
24852486 if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Addr.getOperand (1 ))) {
24862487 SDValue base = Addr.getOperand (0 );
24872488 if (SelectDirectAddr (base, Base)) {
2488- Offset = CurDAG-> getTargetConstant (CN-> getZExtValue (), SDLoc (OpNode),
2489- mvt );
2489+ Offset =
2490+ CurDAG-> getTargetConstant (CN-> getZExtValue (), SDLoc (OpNode), VT );
24902491 return true ;
24912492 }
24922493 }
@@ -2507,11 +2508,12 @@ bool NVPTXDAGToDAGISel::SelectADDRsi64(SDNode *OpNode, SDValue Addr,
25072508}
25082509
25092510// 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) {
25122514 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 );
25152517 return true ;
25162518 }
25172519 if (Addr.getOpcode () == ISD::TargetExternalSymbol ||
@@ -2526,7 +2528,7 @@ bool NVPTXDAGToDAGISel::SelectADDRri_imp(
25262528 if (FrameIndexSDNode *FIN =
25272529 dyn_cast<FrameIndexSDNode>(Addr.getOperand (0 )))
25282530 // Constant offset from frame ref.
2529- Base = CurDAG->getTargetFrameIndex (FIN->getIndex (), mvt );
2531+ Base = CurDAG->getTargetFrameIndex (FIN->getIndex (), VT );
25302532 else
25312533 Base = Addr.getOperand (0 );
25322534
0 commit comments