commit e2b66a81e8db712fc632b1a4949f0cd355d742b2
author Steve Naroff <snaroff@apple.com> Wed Sep 24 22:26:48 2008 +0000
committer Steve Naroff <snaroff@apple.com> Wed Sep 24 22:26:48 2008 +0000
tree 5225f5ba68f07fbe3ab53f29440d1023c234fb91
parent b8109085cdde269986d1c37ea6eee91699485365

Fix <rdar://problem/6243788> clang: Incorrect return statement for Blocks?


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

lib/Sema/SemaStmt.cpp

diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp
index 3cadd52..df832b7 100644
--- a/lib/Sema/SemaStmt.cpp
+++ b/lib/Sema/SemaStmt.cpp
@@ -679,7 +679,9 @@
   // the block from it.
   if (CurBlock->ReturnType == 0) {
     if (RetValExp) {
-      UsualUnaryConversions(RetValExp);
+      // Don't call UsualUnaryConversions(), since we don't want to do
+      // integer promotions here.
+      DefaultFunctionArrayConversion(RetValExp);
       CurBlock->ReturnType = RetValExp->getType().getTypePtr();
     } else
       CurBlock->ReturnType = Context.VoidTy.getTypePtr();