Skip to content

[AArch64] Fix register reversing crash on MSVC with 1 pair. #82392

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

Closed
ScottTodd wants to merge 3 commits into from
Closed

[AArch64] Fix register reversing crash on MSVC with 1 pair. #82392

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
528a304
[AArch64] Fix register reversing crash on MSVC with 1 pair.
ScottTodd Feb 20, 2024
80483c7
Run clang-format.
ScottTodd Feb 20, 2024
02cbedc
Another clang-format fix. (entire file has diffs, keeping local)
ScottTodd Feb 20, 2024
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
22 changes: 14 additions & 8 deletions llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3115,14 +3115,20 @@ bool AArch64FrameLowering::restoreCalleeSavedRegisters(
}

// For performance reasons restore SVE register in increasing order
auto IsPPR = [](const RegPairInfo &c) { return c.Type == RegPairInfo::PPR; };
auto PPRBegin = std::find_if(RegPairs.begin(), RegPairs.end(), IsPPR);
auto PPREnd = std::find_if(RegPairs.rbegin(), RegPairs.rend(), IsPPR);
std::reverse(PPRBegin, PPREnd.base());
auto IsZPR = [](const RegPairInfo &c) { return c.Type == RegPairInfo::ZPR; };
auto ZPRBegin = std::find_if(RegPairs.begin(), RegPairs.end(), IsZPR);
auto ZPREnd = std::find_if(RegPairs.rbegin(), RegPairs.rend(), IsZPR);
std::reverse(ZPRBegin, ZPREnd.base());
if (RegPairs.size() > 1) {
auto IsPPR = [](const RegPairInfo &c) {
return c.Type == RegPairInfo::PPR;
};
auto PPRBegin = std::find_if(RegPairs.begin(), RegPairs.end(), IsPPR);
auto PPREnd = std::find_if(RegPairs.rbegin(), RegPairs.rend(), IsPPR);
std::reverse(PPRBegin, PPREnd.base());
auto IsZPR = [](const RegPairInfo &c) {
return c.Type == RegPairInfo::ZPR;
};
auto ZPRBegin = std::find_if(RegPairs.begin(), RegPairs.end(), IsZPR);
auto ZPREnd = std::find_if(RegPairs.rbegin(), RegPairs.rend(), IsZPR);
std::reverse(ZPRBegin, ZPREnd.base());
}

for (const RegPairInfo &RPI : RegPairs) {
unsigned Reg1 = RPI.Reg1;
Expand Down