fixes the diagnostic issued in // rdar://11069896

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153217 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp
index 333f6dd25526df917fb3d40517cb70ac9e4b46ff..1ddedcfe6802ab11ebf95564965ca893a06bae1c 100644 (file)
--- a/lib/Sema/SemaStmt.cpp
+++ b/lib/Sema/SemaStmt.cpp
@@ -1888,7 +1888,7 @@ Sema::ActOnCapScopeReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp) {
            RetValExp->getType()->isVoidType()))) {
       if (!getLangOpts().CPlusPlus &&
           RetValExp->getType()->isVoidType())
-        Diag(ReturnLoc, diag::ext_return_has_void_expr) << "" << 2;
+        Diag(ReturnLoc, diag::ext_return_has_void_expr) << "literal" << 2;
       else {
         Diag(ReturnLoc, diag::err_return_block_has_expr);
         RetValExp = 0;

diff --git a/test/Sema/block-return.c b/test/Sema/block-return.c
index 67bc5c7dfe20addecff64648c22530955b895973..6967955b08789c7f145329b71d74cb1d3f2dc15b 100644 (file)
--- a/test/Sema/block-return.c
+++ b/test/Sema/block-return.c
@@ -132,5 +132,5 @@ void foo7()
 
 // rdar://11069896
 void (^blk)(void) = ^{
-    return (void)0; // expected-warning {{void block  should not return void expression}}
+    return (void)0; // expected-warning {{void block literal should not return void expression}}
 };