diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp
index 4aa98d2..752228e 100644
--- a/lib/CodeGen/TargetInfo.cpp
+++ b/lib/CodeGen/TargetInfo.cpp
@@ -2757,9 +2757,7 @@
     }
   }
 
-  // FIXME: byval for AAPCS is not yet supported; we need it for performance
-  // and to support large alignment.
-  if (getABIKind() == ARMABIInfo::APCS) {
+  if (getABIKind() == ARMABIInfo::APCS || getABIKind() == ARMABIInfo::AAPCS) {
     if (getContext().getTypeSizeInChars(Ty) > CharUnits::fromQuantity(64) ||
         getContext().getTypeAlign(Ty) > 64) {
       return ABIArgInfo::getIndirect(0, /*ByVal=*/true);
diff --git a/test/CodeGen/arm-arguments.c b/test/CodeGen/arm-arguments.c
index dd18414..2ec729e 100644
--- a/test/CodeGen/arm-arguments.c
+++ b/test/CodeGen/arm-arguments.c
@@ -172,3 +172,9 @@
 void f32(struct s32 s) { }
 // AAPCS: @f32([1 x i64] %s.coerce)
 // APCS-GNU: @f32([2 x i32] %s.coerce)
+
+// PR13350
+struct s33 { char buf[32*32]; };
+void f33(struct s33 s) { }
+// APCS-GNU: define void @f33(%struct.s33* byval %s)
+// AAPCS: define arm_aapcscc void @f33(%struct.s33* byval %s)