Skip to content

[clang][codegen] Fix ABI for HVA/HFA returns on x86_64 MSVC #113104

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −0
Open

[clang][codegen] Fix ABI for HVA/HFA returns on x86_64 MSVC #113104

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: 4 additions & 0 deletions clang/lib/CodeGen/MicrosoftCXXABI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,6 +1110,10 @@ static bool isTrivialForMSVC(const CXXRecordDecl *RD, QualType Ty,
isa<VectorType>(Base)) {
return true;
}
if (CGM.getTarget().getTriple().isX86() &&
CGM.getABIInfo().isHomogeneousAggregate(Ty, Base, NumElts)) {
Copy link
Collaborator

@efriedma-quic efriedma-quic Oct 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it might affect non-vectorcall calls; can you check (and add a testcase)?

Please also add test coverage for 32-bit x86.

return true;
}

// We use the C++14 definition of an aggregate, so we also
// check for:
Expand Down
19 changes: 19 additions & 0 deletions clang/test/CodeGenCXX/homogeneous-aggregates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,3 +302,22 @@ struct test2 : base2 { test2(double); protected: double v2;};
test2 f(test2 *x) { return *x; }
// WOA64: define dso_local void @"?f@pr62223@@YA?AUtest2@1@PEAU21@@Z"(ptr dead_on_unwind inreg noalias writable sret(%"struct.pr62223::test2") align 8 %{{.*}}, ptr noundef %{{.*}})
}

namespace pr113104 {
struct HFA {
float a;
float b;
};

using HVA = float __attribute__((__vector_size__(16), __aligned__(16)));

struct base_hfa { HFA v1; };
struct test_hfa : base_hfa { test_hfa(double); protected: HFA v2;};
test_hfa CC f(test_hfa *x) { return *x; }
// X64: define dso_local x86_vectorcallcc %"struct.pr113104::test_hfa" @"\01_ZN8pr1131041fEPNS_8test_hfaE@@8"(ptr noundef %x)

struct base_hva { HVA v1; };
struct test_hva : base_hva { test_hva(double); protected: HVA v2;};
test_hva CC f(test_hva *x) { return *x; }
// X64: define dso_local x86_vectorcallcc %"struct.pr113104::test_hva" @"\01_ZN8pr1131041fEPNS_8test_hvaE@@8"(ptr noundef %x)
}
Loading