[cfe-commits] r151173 - in /cfe/trunk: lib/Sema/SemaStmt.cpp test/SemaCXX/cxx0x-return-init-list.cpp

[Sebastian Redl]

Author: cornedbee
Date: Wed Feb 22 11:38:04 2012
New Revision: 151173

URL: http://llvm.org/viewvc/llvm-project?rev=151173&view=rev
Log:
Doug's review comments.

Modified:
    cfe/trunk/lib/Sema/SemaStmt.cpp
    cfe/trunk/test/SemaCXX/cxx0x-return-init-list.cpp

Modified: cfe/trunk/lib/Sema/SemaStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=151173&r1=151172&r2=151173&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaStmt.cpp (original)
+++ cfe/trunk/lib/Sema/SemaStmt.cpp Wed Feb 22 11:38:04 2012
@@ -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()))) {

Modified: cfe/trunk/test/SemaCXX/cxx0x-return-init-list.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx0x-return-init-list.cpp?rev=151173&r1=151172&r2=151173&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/cxx0x-return-init-list.cpp (original)
+++ cfe/trunk/test/SemaCXX/cxx0x-return-init-list.cpp Wed Feb 22 11:38:04 2012
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 
 // Test that a very basic variation of generalized initializer returns (that
-// required for libstdc++ 4.5) is supposed in C++98.
+// required for libstdc++ 4.5) is supported in C++98.
 
 int test0(int i) {
   return { i }; // expected-warning{{generalized initializer lists are a C++11 extension}}