Index: lib/CodeGen/TargetInfo.cpp
===================================================================
--- lib/CodeGen/TargetInfo.cpp
+++ lib/CodeGen/TargetInfo.cpp
@@ -5039,6 +5039,10 @@
   if (const EnumType *EnumTy = Ty->getAs<EnumType>())
     Ty = EnumTy->getDecl()->getIntegerType();
 
+  // Return aggregates type as indirect by value
+  if (isAggregateTypeForABI(Ty))
+    return ABIArgInfo::getIndirect(0, /* byval */ true);
+
   return (Ty->isPromotableIntegerType() ?
           ABIArgInfo::getExtend() : ABIArgInfo::getDirect());
 }
Index: test/CodeGen/nvptx-abi.c
===================================================================
--- test/CodeGen/nvptx-abi.c
+++ test/CodeGen/nvptx-abi.c
@@ -5,13 +5,39 @@
   float x, y, z, w;
 } float4_t;
 
-float4_t my_function(void);
+float4_t my_function(void) {
+// CHECK: define %struct.float4_s @my_function
+  float4_t t;
+  return t;
+};
 
-// CHECK-DAG: declare %struct.float4_s @my_function
-
 float bar(void) {
   float4_t ret;
-// CHECK-DAG: call %struct.float4_s @my_function
+// CHECK-LABEL: @bar
+// CHECK: call %struct.float4_s @my_function
   ret = my_function();
   return ret.x;
 }
+
+void foo(float4_t x) {
+// CHECK-LABEL: @foo
+// CHECK: %struct.float4_s* byval %x
+}
+
+void fooN(float4_t x, float4_t y, float4_t z) {
+// CHECK-LABEL: @fooN
+// CHECK: %struct.float4_s* byval %x
+// CHECK: %struct.float4_s* byval %y
+// CHECK: %struct.float4_s* byval %z
+}
+
+typedef struct nested_s {
+  unsigned long long x;
+  float z[64];
+  float4_t t;
+} nested_t;
+
+void baz(nested_t x) {
+// CHECK-LABEL: @baz
+// CHECK: %struct.nested_s* byval %x)
+}