Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/expr.c
Original file line number Diff line number Diff line change
Expand Up @@ -49254,7 +49254,24 @@ suspend point.
} /* if */
node->variant.await_info.ready_resume_suspend->next->next =
make_node_from_operand(&suspend_call);
make_expression_operand(node, operand);
if (is_a_glvalue(&resume_call)) {
/* await_resume returns a reference, so the co_await expression is a
glvalue too (an lvalue or xvalue, like the await_resume call). As
for a call, give the node the reference type and put a reference
indirection on top of it. */
an_expr_node_ptr call = strip_ref_indirect(
node->variant.await_info.ready_resume_suspend->next,
/*parens_also=*/FALSE);
if (is_any_reference_type(call->type)) {
node->type = call->type;
node = add_ref_indirection_to_node(node);
if (is_an_xvalue(&resume_call)) {
node->is_lvalue = FALSE;
node->is_xvalue = TRUE;
} /* if */
} /* if */
} /* if */
make_lvalue_or_rvalue_expression_operand(node, operand);
done:;
} /* add_await_to_operand */

Expand Down
15 changes: 15 additions & 0 deletions src/pending_changes/gh-447-co-await-value-category.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[GH #447]
Value category of co_await and co_yield expressions

A co_await or co_yield expression was always treated as a prvalue, even
when the await_resume call returns a reference. It now has the value
category of the await_resume call, so code like this is accepted:

struct bool_ref_awaiter {
bool await_ready() noexcept;
void await_suspend(std::coroutine_handle<>) noexcept;
bool &await_resume() noexcept;
};
task f() {
(co_await bool_ref_awaiter{}) = false;
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Making await_ready and await_resume both constexpr will get us an internal error:

  bool b;
  struct bool_ref_awaiter {
    constexpr bool await_ready() noexcept { return true; }
    void await_suspend(std::coroutine_handle<>) noexcept;
    constexpr bool &await_resume() noexcept { return b; }
  };
  task f() {
    (co_await bool_ref_awaiter{}) = false;
  }

internal error: assertion failed at: "lower_il.c", line 14853 in lower_reuse_value_expr

Seems like there are more fixes needed in that area.

2 changes: 1 addition & 1 deletion tests/expectations/edg_x86_64/edg.log
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ gnats/21112.sft.cpp:fp:-DTEST_NUMBER=1:FAIL:
gnats/21435.sft.cpp:cp:-DTEST_NUMBER=1:FAIL:
gnats/21436.sft.cpp:fn:-DTEST_NUMBER=1:FAIL:
gnats/21543.sft.cpp:fn:-DTEST_NUMBER=1:FAIL:
gnats/21769.sft.cpp:cp:-DTEST_NUMBER=1:FAIL:
gnats/21769.sft.cpp:cp:-DTEST_NUMBER=1:BADC:
gnats/21821.sft.cpp:fn:-DTEST_NUMBER=1:FAIL:
gnats/21822.sft.cpp:fn:-DTEST_NUMBER=1:FAIL:
gnats/21824.sft.cpp:fn:-DTEST_NUMBER=1:FAIL:
Expand Down
1 change: 1 addition & 0 deletions tests/tests/changes/.GH447.rto/default.1.1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fe_only -DTEST_NUMBER=1 --c++23 Test_name.c
62 changes: 62 additions & 0 deletions tests/tests/changes/GH447.sft.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
//type:fp
//options:--c++23
//remark:[GH #447] co_await has the value category of await_resume()
//
// A co_await or co_yield expression was always treated as a prvalue, so
// assigning to the result of an await_resume() that returns an lvalue
// reference was rejected.

namespace std {
template <typename = void> struct coroutine_handle;
template <> struct coroutine_handle<> { void *address(); };
template <typename> struct coroutine_handle {
static coroutine_handle from_address(void *);
operator coroutine_handle<>() noexcept;
};
template <typename R, typename...> struct coroutine_traits {
using promise_type = typename R::promise_type;
};
template <class T, class U> struct is_same { static constexpr bool value = false; };
template <class T> struct is_same<T, T> { static constexpr bool value = true; };
} // namespace std

struct suspend {
bool await_ready() noexcept;
void await_suspend(std::coroutine_handle<>) noexcept;
void await_resume() noexcept;
};

template <class R> struct awaiter {
bool await_ready() noexcept;
void await_suspend(std::coroutine_handle<>) noexcept;
R await_resume() noexcept;
};

struct task;

struct promise {
suspend initial_suspend() noexcept;
suspend final_suspend() noexcept;
void return_void();
void unhandled_exception();
task get_return_object();
awaiter<int &> yield_value(int);
};

struct task {
using promise_type = promise;
};

task f() {
(co_await awaiter<bool &>{}) = false;
bool *p = &co_await awaiter<bool &>{};
decltype(auto) a = co_await awaiter<bool &>{};
decltype(auto) b = co_await awaiter<bool &&>{};
decltype(auto) c = co_await awaiter<bool>{};
static_assert(std::is_same<decltype(a), bool &>::value);
static_assert(std::is_same<decltype(b), bool &&>::value);
static_assert(std::is_same<decltype(c), bool>::value);
int &r = co_yield 1;
decltype(auto) d = co_yield 1;
static_assert(std::is_same<decltype(d), int &>::value);
}
12 changes: 7 additions & 5 deletions tests/tests/edg/gnats/.21769.rto/default.1.1.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cpfe -DTEST_NUMBER=1 --set_flag coroutines --no_ms_perm --microsoft_v 1923 Test_name.c
"Test_name.c", line 51: error: initial value of reference to non-const must be an lvalue
Immovable &r1 = co_await Aw{};
^

1 error detected in the compilation of "Test_name.c".
eccp: diagnostics generated from compilation of Test_name.int.c:
Test_name.c: In function '_Z1fv':
Test_name.c:51:14: error: 'co_await__T9' undeclared (first use in this function)
Test_name.c:51:14: note: each undeclared identifier is reported only once for each function it appears in
Test_name.c:51:172: error: '__T18' undeclared (first use in this function); did you mean '__T17'?
eccp: end of diagnostics from compilation of Test_name.int.c
eccp: gcc compilation of Test_name.int.c returned an exit status of 1
Loading