diff options
| author | Guanzhong Chen <gzchen@google.com> | 2019-08-15 19:33:36 +0000 |
|---|---|---|
| committer | Guanzhong Chen <gzchen@google.com> | 2019-08-15 19:33:36 +0000 |
| commit | 82bfd1d25712f8c1b714614f3df559c773f08988 (patch) | |
| tree | 59a24f8d01e797433cbc2225343ef792cc9ba3a5 /clang/lib/CodeGen/TargetInfo.cpp | |
| parent | 0c476111317cb7aaa9a3e9f75e1c35f83122ee26 (diff) | |
| download | llvm-82bfd1d25712f8c1b714614f3df559c773f08988.zip llvm-82bfd1d25712f8c1b714614f3df559c773f08988.tar.gz llvm-82bfd1d25712f8c1b714614f3df559c773f08988.tar.bz2 | |
[WebAssembly] Correctly handle va_arg of zero-sized structures
Summary:
D66168 passes size 0 structs indirectly, while the wasm backend expects it to
be passed directly. This causes subsequent variadic arguments to be read
incorrectly.
This diff changes it so that size 0 structs are passed directly.
Reviewers: dschuff, tlively, sbc100
Reviewed By: dschuff
Subscribers: jgravelle-google, aheejin, sunfish, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D66255
llvm-svn: 369042
Diffstat (limited to 'clang/lib/CodeGen/TargetInfo.cpp')
| -rw-r--r-- | clang/lib/CodeGen/TargetInfo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/TargetInfo.cpp b/clang/lib/CodeGen/TargetInfo.cpp index d96b540..1124154 100644 --- a/clang/lib/CodeGen/TargetInfo.cpp +++ b/clang/lib/CodeGen/TargetInfo.cpp @@ -833,8 +833,9 @@ ABIArgInfo WebAssemblyABIInfo::classifyReturnType(QualType RetTy) const { Address WebAssemblyABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr, QualType Ty) const { - bool IsIndirect = - isAggregateTypeForABI(Ty) && !isSingleElementStruct(Ty, getContext()); + bool IsIndirect = isAggregateTypeForABI(Ty) && + !isEmptyRecord(getContext(), Ty, true) && + !isSingleElementStruct(Ty, getContext()); return emitVoidPtrVAArg(CGF, VAListAddr, Ty, IsIndirect, getContext().getTypeInfoInChars(Ty), CharUnits::fromQuantity(4), |