1 files changed, 1 insertions, 5 deletions
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index 83181a497d..fff1a84f70 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -66,11 +66,7 @@ const llvm::Type *CodeGenFunction::ConvertType(QualType T) {
 }
 
 bool CodeGenFunction::hasAggregateLLVMType(QualType T) {
-  // FIXME: Use positive checks instead of negative ones to be more robust in
-  // the face of extension.
-  return !T->hasPointerRepresentation() && !T->isRealType() &&
-    !T->isVoidType() && !T->isVectorType() && !T->isFunctionType() &&
-    !T->isBlockPointerType() && !T->isMemberPointerType();
+  return T->isRecordType() || T->isArrayType() || T->isAnyComplexType();
 }
 
 void CodeGenFunction::EmitReturnBlock() {