diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2021-03-14 14:42:52 +0000 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2021-03-15 15:57:42 +0000 |
| commit | 541840b891d61ea70cddd046c96698bb70d7f52c (patch) | |
| tree | cd8f9ae7496569d1fbd22420faaaff24f65a1eba /gcc/cp | |
| parent | 020b286c769f4dc8a6b45491351f6bc2e69d7a7f (diff) | |
| download | gcc-541840b891d61ea70cddd046c96698bb70d7f52c.zip gcc-541840b891d61ea70cddd046c96698bb70d7f52c.tar.gz gcc-541840b891d61ea70cddd046c96698bb70d7f52c.tar.bz2 | |
coroutines : Convert await_ready () expressions to bool [PR99047].
The awaiter.await_ready() should be converted per [expr.await]/3
(3.6) await-ready is the expression e.await_ready(), contextually
converted to bool.
gcc/cp/ChangeLog:
PR c++/99047
* coroutines.cc (expand_one_await_expression): If the
await_ready() expression is not a boolean then convert it
as required.
gcc/testsuite/ChangeLog:
PR c++/99047
* g++.dg/coroutines/pr99047.C: New test.
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/coroutines.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc index ea714da..51984ef 100644 --- a/gcc/cp/coroutines.cc +++ b/gcc/cp/coroutines.cc @@ -1586,7 +1586,13 @@ expand_one_await_expression (tree *stmt, tree *await_expr, void *d) /* Use the await_ready() call to test if we need to suspend. */ tree ready_cond = TREE_VEC_ELT (awaiter_calls, 0); /* await_ready(). */ - ready_cond = build1_loc (loc, TRUTH_NOT_EXPR, boolean_type_node, ready_cond); + /* Convert to bool, if necessary. */ + if (TREE_CODE (TREE_TYPE (ready_cond)) != BOOLEAN_TYPE) + ready_cond = cp_convert (boolean_type_node, ready_cond, + tf_warning_or_error); + /* Be aggressive in folding here, since there are a significant number of + cases where the ready condition is constant. */ + ready_cond = invert_truthvalue_loc (loc, ready_cond); ready_cond = build1_loc (loc, CLEANUP_POINT_EXPR, boolean_type_node, ready_cond); |