Author: Matt Arsenault Date: 2021-01-04T12:53:06-05:00 New Revision: d8938c8bb5479b168d27d3e161cb3a53e8ff09f0
URL: https://github.com/llvm/llvm-project/commit/d8938c8bb5479b168d27d3e161cb3a53e8ff09f0 DIFF: https://github.com/llvm/llvm-project/commit/d8938c8bb5479b168d27d3e161cb3a53e8ff09f0.diff LOG: CodeGen: Use Register Added: Modified: llvm/include/llvm/CodeGen/MachineFrameInfo.h llvm/lib/Target/RISCV/RISCVFrameLowering.cpp Removed: ################################################################################ diff --git a/llvm/include/llvm/CodeGen/MachineFrameInfo.h b/llvm/include/llvm/CodeGen/MachineFrameInfo.h index 5cd7f9cde674..7f0ec0df57c5 100644 --- a/llvm/include/llvm/CodeGen/MachineFrameInfo.h +++ b/llvm/include/llvm/CodeGen/MachineFrameInfo.h @@ -14,6 +14,7 @@ #define LLVM_CODEGEN_MACHINEFRAMEINFO_H #include "llvm/ADT/SmallVector.h" +#include "llvm/CodeGen/Register.h" #include "llvm/Support/Alignment.h" #include "llvm/Support/DataTypes.h" #include <cassert> @@ -31,7 +32,7 @@ class AllocaInst; /// Callee saved reg can also be saved to a diff erent register rather than /// on the stack by setting DstReg instead of FrameIdx. class CalleeSavedInfo { - unsigned Reg; + Register Reg; union { int FrameIdx; unsigned DstReg; @@ -58,14 +59,14 @@ class CalleeSavedInfo { : Reg(R), FrameIdx(FI), Restored(true), SpilledToReg(false) {} // Accessors. - unsigned getReg() const { return Reg; } + Register getReg() const { return Reg; } int getFrameIdx() const { return FrameIdx; } unsigned getDstReg() const { return DstReg; } void setFrameIdx(int FI) { FrameIdx = FI; SpilledToReg = false; } - void setDstReg(unsigned SpillReg) { + void setDstReg(Register SpillReg) { DstReg = SpillReg; SpilledToReg = true; } diff --git a/llvm/lib/Target/RISCV/RISCVFrameLowering.cpp b/llvm/lib/Target/RISCV/RISCVFrameLowering.cpp index 3dd68fa36d45..26ff6ddcd048 100644 --- a/llvm/lib/Target/RISCV/RISCVFrameLowering.cpp +++ b/llvm/lib/Target/RISCV/RISCVFrameLowering.cpp @@ -138,7 +138,7 @@ static int getLibCallID(const MachineFunction &MF, // RISCVRegisterInfo::hasReservedSpillSlot assigns negative frame indexes to // registers which can be saved by libcall. if (CS.getFrameIdx() < 0) - MaxReg = std::max(MaxReg.id(), CS.getReg()); + MaxReg = std::max(MaxReg.id(), CS.getReg().id()); if (MaxReg == RISCV::NoRegister) return -1; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
