commit c60873ce44253fdee24f3f6982701837b1ef2bf5
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 57a132c804ad68f8faeacf6af1a4ed312c25459d
parent 2d59db7ae401c4686476671afcceb54312b4133e

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

llvm-svn: 56590

clang/lib/Sema/SemaStmt.cpp

diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 3cadd52..df832b7 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/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();