diff options
author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2012-02-22 17:38:04 +0000 |
---|---|---|
committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2012-02-22 17:38:04 +0000 |
commit | 5b38a0f98e4420dae1bd3e13959bc207c97a9e98 (patch) | |
tree | 3b509f76fdebaa9b6098424f5a76d938afa2b637 /lib/Sema/SemaStmt.cpp | |
parent | 0f5a1930ccf169f9a2885bff18e3169af4aff2a4 (diff) |
Doug's review comments.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151173 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaStmt.cpp')
-rw-r--r-- | lib/Sema/SemaStmt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index a2dda0201b..cad6d674bf 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/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()))) { |