Skip to content

[SelectionDAGBuilder] Remove the added base offset in LowerFormalArguments(). #170732

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.

Sign up for GitHub

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

Open
JonPsson1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[SelectionDAGBuilder] Remove the added base offset in LowerFormalArguments(). #170732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11848,7 +11848,6 @@ void SelectionDAGISel::LowerArguments(const Function &F) {
SmallVector<Type *, 4> Types;
ComputeValueTypes(DAG.getDataLayout(), Arg.getType(), Types);
bool isArgValueUsed = !Arg.use_empty();
unsigned PartBase = 0;
Type *FinalType = Arg.getType();
if (Arg.hasAttribute(Attribute::ByVal))
FinalType = Arg.getParamByValType();
Expand Down Expand Up @@ -11967,7 +11966,7 @@ void SelectionDAGISel::LowerArguments(const Function &F) {
// return values.
ISD::InputArg MyFlags(
Flags, RegisterVT, VT, ArgTy, isArgValueUsed, ArgNo,
PartBase + i * RegisterVT.getStoreSize().getKnownMinValue());
i * RegisterVT.getStoreSize().getKnownMinValue());
if (NumRegs > 1 && i == 0)
MyFlags.Flags.setSplit();
// if it isn't first piece, alignment must be 1
Expand All @@ -11980,7 +11979,6 @@ void SelectionDAGISel::LowerArguments(const Function &F) {
}
if (NeedsRegBlock && Value == NumValues - 1)
Ins[Ins.size() - 1].Flags.setInConsecutiveRegsLast();
PartBase += VT.getStoreSize().getKnownMinValue();
}
}

Expand Down
9 changes: 1 addition & 8 deletions llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2099,17 +2099,10 @@ SDValue SystemZTargetLowering::LowerFormalArguments(
MVT PartVT;
unsigned NumParts;
if (analyzeArgSplit(Ins, ArgLocs, I, PartVT, NumParts)) {
// TODO: It is strange that while LowerCallTo() sets the PartOffset
// relative to the first split part LowerArguments() sets the offset
// from the beginning of the struct. So with {i32, i256}, the
// PartOffset for the i256 parts are differently handled. Try to
// remove that difference and use PartOffset directly here (instead
// of SplitBaseOffs).
unsigned SplitBaseOffs = Ins[I].PartOffset;
for (unsigned PartIdx = 1; PartIdx < NumParts; ++PartIdx) {
++I;
CCValAssign &PartVA = ArgLocs[I];
unsigned PartOffset = Ins[I].PartOffset - SplitBaseOffs;
unsigned PartOffset = Ins[I].PartOffset;
SDValue Address = DAG.getNode(ISD::ADD, DL, PtrVT, ArgValue,
DAG.getIntPtrConstant(PartOffset, DL));
InVals.push_back(DAG.getLoad(PartVA.getValVT(), DL, Chain, Address,
Expand Down
Loading