diff options
| -rw-r--r-- | lib/CodeGen/CGCall.cpp | 12 | ||||
| -rw-r--r-- | test/CodeGen/x86_32-arguments.c | 6 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index 883eb5ede4..49c6f0e3a6 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -404,15 +404,19 @@ ABIArgInfo X86_32ABIInfo::classifyReturnType(QualType RetTy, // Classify "single element" structs as their element type. if (const Type *SeltTy = isSingleElementStruct(RetTy, Context)) { if (const BuiltinType *BT = SeltTy->getAsBuiltinType()) { - // FIXME: This is gross, it would be nice if we could just - // pass back SeltTy and have clients deal with it. Is it worth - // supporting coerce to both LLVM and clang Types? if (BT->isIntegerType()) { - uint64_t Size = Context.getTypeSize(SeltTy); + // We need to use the size of the structure, padding + // bit-fields can adjust that to be larger than the single + // element type. + uint64_t Size = Context.getTypeSize(RetTy); return ABIArgInfo::getCoerce(llvm::IntegerType::get((unsigned) Size)); } else if (BT->getKind() == BuiltinType::Float) { + assert(Context.getTypeSize(RetTy) == Context.getTypeSize(SeltTy) && + "Unexpect single element structure size!"); return ABIArgInfo::getCoerce(llvm::Type::FloatTy); } else if (BT->getKind() == BuiltinType::Double) { + assert(Context.getTypeSize(RetTy) == Context.getTypeSize(SeltTy) && + "Unexpect single element structure size!"); return ABIArgInfo::getCoerce(llvm::Type::DoubleTy); } } else if (SeltTy->isPointerType()) { diff --git a/test/CodeGen/x86_32-arguments.c b/test/CodeGen/x86_32-arguments.c index c75734e5a1..0690639ab1 100644 --- a/test/CodeGen/x86_32-arguments.c +++ b/test/CodeGen/x86_32-arguments.c @@ -133,4 +133,10 @@ struct s30 { char a; char b : 4; } f30(void) {} // RUN: grep 'define float @f31()' %t && struct s31 { char : 0; float b; char : 0} f31(void) {} +// RUN: grep 'define i32 @f32()' %t && +struct s32 { char a; unsigned : 0; } f32(void) {} + +// RUN: grep 'define float @f33()' %t && +struct s33 { float a; long long : 0; } f33(void) {} + // RUN: true |