commit 74b173e5c8c25800dbdbfb50e4acabaf1861e491
author Sebastian Redl <sebastian.redl@getdesigned.at> Wed Feb 22 17:38:04 2012 +0000
committer Sebastian Redl <sebastian.redl@getdesigned.at> Wed Feb 22 17:38:04 2012 +0000
tree 0996366d49a0de35846d3677182944a9e172c940
parent 674c77e5552ebb1bd3ae9ceaa3c6fd5e248ffea9

Doug's review comments.

llvm-svn: 151173

clang/lib/Sema/SemaStmt.cpp

diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index a2dda02..cad6d67 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -1878,7 +1878,7 @@
     // Delay processing for now.  TODO: there are lots of dependent
     // types we can conclusively prove aren't void.
   } else if (FnRetType->isVoidType()) {
-    if (RetValExp &&
+    if (RetValExp && !isa<InitListExpr>(RetValExp) &&
         !(getLangOptions().CPlusPlus &&
           (RetValExp->isTypeDependent() ||
            RetValExp->getType()->isVoidType()))) {