[PATCH] D25296: [Coroutines] Fix co_return statement for initializer list arguments

[Eric Fiselier via cfe-commits]

EricWF created this revision.
EricWF added reviewers: rsmith, GorNishanov.
EricWF added a subscriber: cfe-commits.
Herald added a subscriber: mehdi_amini.

Previously the statement `co_return {42}` would be transformed into `P.return_void()`, since the type of `{42}` is represented as `void` by Clang.

This patch fixes the bug by checking for `InitListExpr` arguments and transforming them accordingly.


https://reviews.llvm.org/D25296

Files:
  lib/Sema/SemaCoroutine.cpp
  test/SemaCXX/coroutines.cpp


Index: test/SemaCXX/coroutines.cpp
===================================================================
--- test/SemaCXX/coroutines.cpp
+++ test/SemaCXX/coroutines.cpp
@@ -78,8 +78,13 @@
 }
 
 struct promise; // expected-note 2{{forward declaration}}
+struct promise_void;
+struct void_tag {};
 template <typename... T>
 struct std::experimental::coroutine_traits<void, T...> { using promise_type = promise; };
+template <typename... T>
+struct std::experimental::coroutine_traits<void, void_tag, T...>
+{ using promise_type = promise_void; };
 
 namespace std {
 namespace experimental {
@@ -106,10 +111,19 @@
   awaitable yield_value(int); // expected-note 2{{candidate}}
   awaitable yield_value(yielded_thing); // expected-note 2{{candidate}}
   not_awaitable yield_value(void()); // expected-note 2{{candidate}}
-  void return_void();
   void return_value(int); // expected-note 2{{here}}
 };
 
+struct promise_void {
+  void get_return_object();
+  suspend_always initial_suspend();
+  suspend_always final_suspend();
+  awaitable yield_value(int);
+  awaitable yield_value(yielded_thing);
+  not_awaitable yield_value(void());
+  void return_void();
+};
+
 void yield() {
   co_yield 0;
   co_yield {"foo", 1, 2};
@@ -126,10 +140,10 @@
   if (n == 0)
     co_return 3;
   if (n == 1)
-    co_return {4};
+    co_return {4}; // expected-warning {{braces around scalar initializer}}
   if (n == 2)
     co_return "foo"; // expected-error {{cannot initialize a parameter of type 'int' with an lvalue of type 'const char [4]'}}
-  co_return;
+  co_return 42;
 }
 
 void mixed_yield() {
@@ -142,11 +156,11 @@
   return; // expected-error {{not allowed in coroutine}}
 }
 
-void only_coreturn() {
+void only_coreturn(void_tag) {
   co_return; // expected-warning {{'co_return' used in a function that uses neither 'co_await' nor 'co_yield'}}
 }
 
-void mixed_coreturn(bool b) {
+void mixed_coreturn(void_tag, bool b) {
   if (b)
     // expected-warning at +1 {{'co_return' used in a function that uses neither}}
     co_return; // expected-note {{use of 'co_return'}}
Index: lib/Sema/SemaCoroutine.cpp
===================================================================
--- lib/Sema/SemaCoroutine.cpp
+++ lib/Sema/SemaCoroutine.cpp
@@ -362,7 +362,7 @@
   // of scope, we should treat the operand as an xvalue for this overload
   // resolution.
   ExprResult PC;
-  if (E && !E->getType()->isVoidType()) {
+  if (E && (isa<InitListExpr>(E) || !E->getType()->isVoidType())) {
     PC = buildPromiseCall(*this, Coroutine, Loc, "return_value", E);
   } else {
     E = MakeFullDiscardedValueExpr(E).get();


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D25296.73710.patch
Type: text/x-patch
Size: 2601 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20161005/ae18a354/attachment-0001.bin>