diff options
| -rw-r--r-- | clang/lib/CodeGen/CGCall.cpp | 17 | ||||
| -rw-r--r-- | clang/test/CodeGen/x86_32-arguments.c | 3 |
2 files changed, 8 insertions, 12 deletions
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp index a1427293439..1df9b0be635 100644 --- a/clang/lib/CodeGen/CGCall.cpp +++ b/clang/lib/CodeGen/CGCall.cpp @@ -446,18 +446,11 @@ ABIArgInfo X86_32ABIInfo::classifyReturnType(QualType RetTy, } } - uint64_t Size = Context.getTypeSize(RetTy); - if (isRegisterSize(Size)) { - // Always return in register for unions for now. - // FIXME: This is wrong, but better than treating as a - // structure. - if (RetTy->isUnionType()) - return ABIArgInfo::getCoerce(llvm::IntegerType::get(Size)); - - // Small structures which are register sized are generally returned - // in a register. - if (X86_32ABIInfo::shouldReturnTypeInRegister(RetTy, Context)) - return ABIArgInfo::getCoerce(llvm::IntegerType::get(Size)); + // Small structures which are register sized are generally returned + // in a register. + if (X86_32ABIInfo::shouldReturnTypeInRegister(RetTy, Context)) { + uint64_t Size = Context.getTypeSize(RetTy); + return ABIArgInfo::getCoerce(llvm::IntegerType::get(Size)); } return ABIArgInfo::getIndirect(0); diff --git a/clang/test/CodeGen/x86_32-arguments.c b/clang/test/CodeGen/x86_32-arguments.c index e31a09cbc73..fae49cbdd87 100644 --- a/clang/test/CodeGen/x86_32-arguments.c +++ b/clang/test/CodeGen/x86_32-arguments.c @@ -151,4 +151,7 @@ struct s36 { struct { int : 0 } a[2][10]; char b; char c; } f36(void) {} // RUN: grep 'define float @f37()' %t && struct s37 { float c[1][1]; } f37(void) {} +// RUN: grep 'define void @f38(.struct.s38. noalias sret .agg.result)' %t && +struct s38 { char a[3]; short b; } f38(void) {} + // RUN: true |
