diff options
author | Reid Kleckner <reid@kleckner.net> | 2014-02-01 00:04:45 +0000 |
---|---|---|
committer | Reid Kleckner <reid@kleckner.net> | 2014-02-01 00:04:45 +0000 |
commit | 314ef7bafda9f507540f3294359f20ba7bcf7a8d (patch) | |
tree | 12c1045bd69401d2014764c56bb55a6a717913f3 /clang/lib/CodeGen/MicrosoftCXXABI.cpp | |
parent | f5b76518c9c1afd2e08a59c11f3de8fb25540b58 (diff) | |
download | bcm5719-llvm-314ef7bafda9f507540f3294359f20ba7bcf7a8d.tar.gz bcm5719-llvm-314ef7bafda9f507540f3294359f20ba7bcf7a8d.zip |
[ms-cxxabi] Use inalloca on win32 when passing non-trivial C++ objects
When a non-trivial parameter is present, clang now gathers up all the
parameters that lack inreg and puts them into a packed struct. MSVC
always aligns each parameter to 4 bytes and no more, so this is a pretty
simple struct to lay out.
On win64, non-trivial records are passed indirectly. Prior to this
change, clang was incorrectly using byval on win64.
I'm able to self-host a working clang with this change and additional
LLVM patches.
Reviewers: rsmith
Differential Revision: http://llvm-reviews.chandlerc.com/D2636
llvm-svn: 200597
Diffstat (limited to 'clang/lib/CodeGen/MicrosoftCXXABI.cpp')
-rw-r--r-- | clang/lib/CodeGen/MicrosoftCXXABI.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp index 875591d0df9..3433c8ca30c 100644 --- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp +++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp @@ -45,8 +45,14 @@ public: } RecordArgABI getRecordArgABI(const CXXRecordDecl *RD) const { - if (RD->hasNonTrivialCopyConstructor() || RD->hasNonTrivialDestructor()) - return RAA_DirectInMemory; + if (RD->hasNonTrivialCopyConstructor() || RD->hasNonTrivialDestructor()) { + llvm::Triple::ArchType Arch = CGM.getTarget().getTriple().getArch(); + if (Arch == llvm::Triple::x86) + return RAA_DirectInMemory; + // On x64, pass non-trivial records indirectly. + // FIXME: Test other Windows architectures. + return RAA_Indirect; + } return RAA_Default; } |