Refactor to share code for handling return statements between lambda expressions and block literals. As it turns out, almost all the logic can be shared.

llvm-svn: 149031

2 files changed, 14 insertions, 2 deletions

diff --git a/clang/test/Parser/objcxx0x-lambda-expressions.mm b/clang/test/Parser/objcxx0x-lambda-expressions.mm
index 06573b94467..5cfb4f8c5a7 100644
--- a/clang/test/Parser/objcxx0x-lambda-expressions.mm
+++ b/clang/test/Parser/objcxx0x-lambda-expressions.mm
@@ -14,8 +14,7 @@ class C {
     [] {}; // expected-error {{lambda expressions are not supported yet}}
     [=] (int i) {}; // expected-error {{lambda expressions are not supported yet}}
     [&] (int) mutable -> void {}; // expected-error {{lambda expressions are not supported yet}}
-    // FIXME: Implicit return type deduction doesn't work yet.
-    [foo,bar] () { return 3; }; // expected-error {{void function 'f' should not return a value}} expected-error {{lambda expressions are not supported yet}}
+    [foo,bar] () { return 3; }; // expected-error {{lambda expressions are not supported yet}}
     [=,&foo] () {}; // expected-error {{lambda expressions are not supported yet}}
     [this] () {}; // expected-error {{lambda expressions are not supported yet}}
   }
diff --git a/clang/test/SemaCXX/lambda-expressions.cpp b/clang/test/SemaCXX/lambda-expressions.cpp
index 9411c34ec8d..db934c3ab77 100644
--- a/clang/test/SemaCXX/lambda-expressions.cpp
+++ b/clang/test/SemaCXX/lambda-expressions.cpp
@@ -52,3 +52,16 @@ namespace ExplicitCapture {
     [this] () {}; // expected-error {{invalid use of 'this'}} expected-error {{not supported yet}}
   }
 }
+
+namespace ReturnDeduction {
+  void test() {
+    [](){ return 1; }; // expected-error {{not supported yet}}
+    [](){ return 1; }; // expected-error {{not supported yet}}
+    [](){ return ({return 1; 1;}); }; // expected-error {{not supported yet}}
+    [](){ return ({return 'c'; 1;}); }; // expected-error {{not supported yet}} expected-error {{must match previous return type}}
+    []()->int{ return 'c'; return 1; }; // expected-error {{not supported yet}}
+    [](){ return 'c'; return 1; }; // expected-error {{not supported yet}} expected-error {{must match previous return type}}
+    // FIXME: Need to check structure of lambda body 
+    [](){ return 1; return 1; }; // expected-error {{not supported yet}}
+  }
+}