[cfe-commits] r153217 - in /cfe/trunk: lib/Sema/SemaStmt.cpp test/Sema/block-return.c

[Fariborz Jahanian]

Author: fjahanian
Date: Wed Mar 21 15:28:39 2012
New Revision: 153217

URL: http://llvm.org/viewvc/llvm-project?rev=153217&view=rev
Log:
fixes the diagnostic issued in // rdar://11069896

Modified:
    cfe/trunk/lib/Sema/SemaStmt.cpp
    cfe/trunk/test/Sema/block-return.c

Modified: cfe/trunk/lib/Sema/SemaStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=153217&r1=153216&r2=153217&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaStmt.cpp (original)
+++ cfe/trunk/lib/Sema/SemaStmt.cpp Wed Mar 21 15:28:39 2012
@@ -1888,7 +1888,7 @@
            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;

Modified: cfe/trunk/test/Sema/block-return.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/block-return.c?rev=153217&r1=153216&r2=153217&view=diff
==============================================================================
--- cfe/trunk/test/Sema/block-return.c (original)
+++ cfe/trunk/test/Sema/block-return.c Wed Mar 21 15:28:39 2012
@@ -132,5 +132,5 @@
 
 // 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}}
 };