From 9354f6aaa70e1543d122644fee0c3f834324d2fc Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Wed, 21 Mar 2012 20:28:39 +0000 Subject: [PATCH] fixes the diagnostic issued in // rdar://11069896 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153217 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaStmt.cpp | 2 +- test/Sema/block-return.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index 333f6dd255..1ddedcfe68 100644 --- 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 67bc5c7dfe..6967955b08 100644 --- 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}} }; -- 2.40.0