[llvm] [LLVM] [X86] Fix integer overflows in frame layout for huge frames (PR #101840)
Matt Arsenault via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 12 05:47:53 PDT 2024
================
@@ -951,11 +953,36 @@ X86RegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
}
if (MI.getOperand(FIOperandNum+3).isImm()) {
- // Offset is a 32-bit integer.
- int Imm = (int)(MI.getOperand(FIOperandNum + 3).getImm());
- int Offset = FIOffset + Imm;
- assert((!Is64Bit || isInt<32>((long long)FIOffset + Imm)) &&
- "Requesting 64-bit offset in 32-bit immediate!");
+ int64_t Imm = MI.getOperand(FIOperandNum + 3).getImm();
+ int64_t Offset = FIOffset + Imm;
+ bool FitsIn32Bits = isInt<32>(Offset);
+ // If the offset will not fit in a 32-bit displacement,
+ // then for 64-bit targets, scavenge a register to hold it.
+ // Otherwise, for 32-bit targets, this is a bug!
+ if (Is64Bit && !FitsIn32Bits) {
+ assert(RS && "RegisterScavenger was NULL");
+ const X86InstrInfo *TII = MF.getSubtarget<X86Subtarget>().getInstrInfo();
+ const DebugLoc &DL = MI.getDebugLoc();
+
+ RS->enterBasicBlockEnd(MBB);
+ RS->backward(std::next(II));
+
+ Register ScratchReg = RS->scavengeRegisterBackwards(
+ X86::GR64RegClass, II, /* RestoreAfter */ false, /* SPAdj */ 0,
+ /* AllowSpill */ true);
----------------
arsenm wrote:
```suggestion
X86::GR64RegClass, II, /*RestoreAfter=*/ false, /*SPAdj= */ 0,
/*AllowSpill=*/ true);
```
https://github.com/llvm/llvm-project/pull/101840
More information about the llvm-commits
mailing list