Skip to content

Commit f93114d

Browse files
committed
[RISCV] Use int64_t for offsets returned from CCState::AllocateStack. NFC
AllocateStack returns int64_t and CCValAssign::getMem expects an int64_t. The interfaces used unsigned prior to da42b28. Offsets for RISC-V should be positive and less than 32-bits so this shouldn't be a functional change.
1 parent 166baf3 commit f93114d

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

llvm/lib/Target/RISCV/RISCVCallingConv.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ bool llvm::CC_RISCV(unsigned ValNo, MVT ValVT, MVT LocVT,
377377
// cases.
378378
MCRegister Reg = State.AllocateReg(ArgGPRs);
379379
if (!Reg) {
380-
unsigned StackOffset = State.AllocateStack(8, Align(8));
380+
int64_t StackOffset = State.AllocateStack(8, Align(8));
381381
State.addLoc(
382382
CCValAssign::getMem(ValNo, ValVT, StackOffset, LocVT, LocInfo));
383383
return false;
@@ -389,7 +389,7 @@ bool llvm::CC_RISCV(unsigned ValNo, MVT ValVT, MVT LocVT,
389389
State.addLoc(
390390
CCValAssign::getCustomReg(ValNo, ValVT, HiReg, LocVT, LocInfo));
391391
} else {
392-
unsigned StackOffset = State.AllocateStack(4, Align(4));
392+
int64_t StackOffset = State.AllocateStack(4, Align(4));
393393
State.addLoc(
394394
CCValAssign::getCustomMem(ValNo, ValVT, StackOffset, LocVT, LocInfo));
395395
}
@@ -471,7 +471,7 @@ bool llvm::CC_RISCV(unsigned ValNo, MVT ValVT, MVT LocVT,
471471
Reg = State.AllocateReg(ArgGPRs);
472472
}
473473

474-
unsigned StackOffset =
474+
int64_t StackOffset =
475475
Reg ? 0 : State.AllocateStack(StoreSizeBytes, StackAlign);
476476

477477
// If we reach this point and PendingLocs is non-empty, we must be at the
@@ -586,19 +586,19 @@ bool llvm::CC_RISCV_FastCC(unsigned ValNo, MVT ValVT, MVT LocVT,
586586
}
587587

588588
if (LocVT == MVT::f16 || LocVT == MVT::bf16) {
589-
unsigned Offset2 = State.AllocateStack(2, Align(2));
589+
int64_t Offset2 = State.AllocateStack(2, Align(2));
590590
State.addLoc(CCValAssign::getMem(ValNo, ValVT, Offset2, LocVT, LocInfo));
591591
return false;
592592
}
593593

594594
if (LocVT == MVT::i32 || LocVT == MVT::f32) {
595-
unsigned Offset4 = State.AllocateStack(4, Align(4));
595+
int64_t Offset4 = State.AllocateStack(4, Align(4));
596596
State.addLoc(CCValAssign::getMem(ValNo, ValVT, Offset4, LocVT, LocInfo));
597597
return false;
598598
}
599599

600600
if (LocVT == MVT::i64 || LocVT == MVT::f64) {
601-
unsigned Offset5 = State.AllocateStack(8, Align(8));
601+
int64_t Offset5 = State.AllocateStack(8, Align(8));
602602
State.addLoc(CCValAssign::getMem(ValNo, ValVT, Offset5, LocVT, LocInfo));
603603
return false;
604604
}
@@ -626,16 +626,15 @@ bool llvm::CC_RISCV_FastCC(unsigned ValNo, MVT ValVT, MVT LocVT,
626626
LocInfo = CCValAssign::Indirect;
627627
LocVT = Subtarget.getXLenVT();
628628
unsigned XLen = Subtarget.getXLen();
629-
unsigned StackOffset = State.AllocateStack(XLen / 8, Align(XLen / 8));
629+
int64_t StackOffset = State.AllocateStack(XLen / 8, Align(XLen / 8));
630630
State.addLoc(
631631
CCValAssign::getMem(ValNo, ValVT, StackOffset, LocVT, LocInfo));
632632
return false;
633633
}
634634

635635
// Pass fixed-length vectors on the stack.
636636
auto StackAlign = MaybeAlign(ValVT.getScalarSizeInBits() / 8).valueOrOne();
637-
unsigned StackOffset =
638-
State.AllocateStack(ValVT.getStoreSize(), StackAlign);
637+
int64_t StackOffset = State.AllocateStack(ValVT.getStoreSize(), StackAlign);
639638
State.addLoc(
640639
CCValAssign::getMem(ValNo, ValVT, StackOffset, LocVT, LocInfo));
641640
return false;

0 commit comments

Comments
 (0)