diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index 2a54bcc3af..8ca1e00823 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -1622,7 +1622,10 @@ TypeSourceInfo *Sema::GetTypeForDeclarator(Declarator &D, Scope *S,
       if ((T->isArrayType() || T->isFunctionType()) &&
           (D.getName().getKind() != UnqualifiedId::IK_ConversionFunctionId)) {
         unsigned diagID = diag::err_func_returning_array_function;
-        if (D.getContext() == Declarator::BlockLiteralContext)
+        // Last processing chunk in block context means this function chunk
+        // represents the block.
+        if (chunkIndex == 0 &&
+            D.getContext() == Declarator::BlockLiteralContext)
           diagID = diag::err_block_returning_array_function;
         Diag(DeclType.Loc, diagID) << T->isFunctionType() << T;
         T = Context.IntTy;
diff --git a/test/Sema/block-return.c b/test/Sema/block-return.c
index 2eb51e79cc..23dbbc2ce6 100644
--- a/test/Sema/block-return.c
+++ b/test/Sema/block-return.c
@@ -98,6 +98,7 @@ bptr foo5(int j) {
 
 int (*funcptr3[5])(long);
 int sz8 = sizeof(^int (*[5])(long) {return funcptr3;}); // expected-error {{block cannot return array type}} expected-warning {{incompatible pointer to integer conversion}}
+int sz9 = sizeof(^int(*())()[3]{ }); // expected-error {{function cannot return array type}}
 
 void foo6() {
   int (^b)(int) __attribute__((noreturn));