Skip to content

[AArch64][GISel] Use Register instead of MCRegister for markPhysRegUsed in CallLowering. #122853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 16, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ struct IncomingArgHandler : public CallLowering::IncomingValueHandler {

void assignValueToReg(Register ValVReg, Register PhysReg,
const CCValAssign &VA) override {
markPhysRegUsed(PhysReg);
markRegUsed(PhysReg);
IncomingValueHandler::assignValueToReg(ValVReg, PhysReg, VA);
}

Expand Down Expand Up @@ -207,16 +207,16 @@ struct IncomingArgHandler : public CallLowering::IncomingValueHandler {
/// How the physical register gets marked varies between formal
/// parameters (it's a basic-block live-in), and a call instruction
/// (it's an implicit-def of the BL).
virtual void markPhysRegUsed(MCRegister PhysReg) = 0;
virtual void markRegUsed(Register Reg) = 0;
};

struct FormalArgHandler : public IncomingArgHandler {
FormalArgHandler(MachineIRBuilder &MIRBuilder, MachineRegisterInfo &MRI)
: IncomingArgHandler(MIRBuilder, MRI) {}

void markPhysRegUsed(MCRegister PhysReg) override {
MIRBuilder.getMRI()->addLiveIn(PhysReg);
MIRBuilder.getMBB().addLiveIn(PhysReg);
void markRegUsed(Register Reg) override {
MIRBuilder.getMRI()->addLiveIn(Reg.asMCReg());
MIRBuilder.getMBB().addLiveIn(Reg.asMCReg());
}
};

Expand All @@ -225,8 +225,8 @@ struct CallReturnHandler : public IncomingArgHandler {
MachineInstrBuilder MIB)
: IncomingArgHandler(MIRBuilder, MRI), MIB(MIB) {}

void markPhysRegUsed(MCRegister PhysReg) override {
MIB.addDef(PhysReg, RegState::Implicit);
void markRegUsed(Register Reg) override {
MIB.addDef(Reg, RegState::Implicit);
}

MachineInstrBuilder MIB;
Expand All @@ -239,7 +239,7 @@ struct ReturnedArgCallReturnHandler : public CallReturnHandler {
MachineInstrBuilder MIB)
: CallReturnHandler(MIRBuilder, MRI, MIB) {}

void markPhysRegUsed(MCRegister PhysReg) override {}
void markRegUsed(Register Reg) override {}
};

struct OutgoingArgHandler : public CallLowering::OutgoingValueHandler {
Expand Down
Loading