summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema
diff options
context:
space:
mode:
authorSebastian Redl <sebastian.redl@getdesigned.at>2012-02-22 17:38:04 +0000
committerSebastian Redl <sebastian.redl@getdesigned.at>2012-02-22 17:38:04 +0000
commit74b173e5c8c25800dbdbfb50e4acabaf1861e491 (patch)
tree0996366d49a0de35846d3677182944a9e172c940 /clang/lib/Sema
parent674c77e5552ebb1bd3ae9ceaa3c6fd5e248ffea9 (diff)
downloadbcm5719-llvm-74b173e5c8c25800dbdbfb50e4acabaf1861e491.tar.gz
bcm5719-llvm-74b173e5c8c25800dbdbfb50e4acabaf1861e491.zip
Doug's review comments.
llvm-svn: 151173
Diffstat (limited to 'clang/lib/Sema')
-rw-r--r--clang/lib/Sema/SemaStmt.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index a2dda0201ba..cad6d674bf8 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -1878,7 +1878,7 @@ Sema::ActOnCapScopeReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp) {
// 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()))) {
OpenPOWER on IntegriCloud