1 files changed, 7 insertions, 0 deletions
diff --git a/clang/CodeGen/CodeGenTypes.cpp b/clang/CodeGen/CodeGenTypes.cpp
index 4210402bc5d..58664643039 100644
--- a/clang/CodeGen/CodeGenTypes.cpp
+++ b/clang/CodeGen/CodeGenTypes.cpp
@@ -108,6 +108,13 @@ const llvm::Type *CodeGenTypes::ConvertType(QualType T) {
     // FIXME: Convert argument types.
     bool isVarArg;
     std::vector<const llvm::Type*> ArgTys;
+    
+    // Struct return passes the struct byref.
+    if (!ResultType->isFirstClassType()) {
+      ArgTys.push_back(llvm::PointerType::get(ResultType));
+      ResultType = llvm::Type::VoidTy;
+    }
+    
     if (const FunctionTypeProto *FTP = dyn_cast<FunctionTypeProto>(&FP)) {
       DecodeArgumentTypes(*FTP, ArgTys);
       isVarArg = FTP->isVariadic();