diff --git a/CodeGen/CGExpr.cpp b/CodeGen/CGExpr.cpp
index 65d03c2..08bd93f 100644
--- a/CodeGen/CGExpr.cpp
+++ b/CodeGen/CGExpr.cpp
@@ -721,7 +721,14 @@
   
   llvm::SmallVector<llvm::Value*, 16> Args;
   
-  // FIXME: Handle struct return.
+  // Handle struct-return functions by passing a pointer to the location that
+  // we would like to return into.
+  if (hasAggregateLLVMType(E->getType())) {
+    // Create a temporary alloca to hold the result of the call. :(
+    Args.push_back(CreateTempAlloca(ConvertType(E->getType())));
+    // FIXME: set the stret attribute on the argument.
+  }
+  
   for (unsigned i = 0, e = E->getNumArgs(); i != e; ++i) {
     QualType ArgTy = E->getArg(i)->getType();
     RValue ArgVal = EmitExpr(E->getArg(i));
@@ -752,8 +759,10 @@
   llvm::Value *V = Builder.CreateCall(Callee, &Args[0], &Args[0]+Args.size());
   if (V->getType() != llvm::Type::VoidTy)
     V->setName("call");
-  
-  // FIXME: Struct return;
+  else if (hasAggregateLLVMType(E->getType()))
+    // Struct return.
+    return RValue::getAggregate(Args[0]);
+      
   return RValue::get(V);
 }
 
diff --git a/CodeGen/CodeGenFunction.cpp b/CodeGen/CodeGenFunction.cpp
index 8cea3e7..389bd05 100644
--- a/CodeGen/CodeGenFunction.cpp
+++ b/CodeGen/CodeGenFunction.cpp
@@ -45,7 +45,7 @@
 
 bool CodeGenFunction::hasAggregateLLVMType(QualType T) {
   return !T->isRealType() && !T->isPointerType() && !T->isVoidType() &&
-         !T->isVectorType();
+         !T->isVectorType() && !T->isFunctionType();
 }