aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenno Evers <benno.evers@tenzir.com>2022-04-02 17:22:33 +0100
committerIain Sandoe <iain@sandoe.co.uk>2022-04-03 10:10:13 +0100
commit0847ad33b908af88bca1e6980d0b977316d05e18 (patch)
tree9b793745e615e8dcbd26f137f49e7706957a4efb
parent235d5a96cb8dad0b4c427602346fcf966a4ec914 (diff)
downloadgcc-0847ad33b908af88bca1e6980d0b977316d05e18.zip
gcc-0847ad33b908af88bca1e6980d0b977316d05e18.tar.gz
gcc-0847ad33b908af88bca1e6980d0b977316d05e18.tar.bz2
c++: Fix ICE due to shared BLOCK node in coroutine generation [PR103328]
When finishing a function that is a coroutine, the function is transformed into a "ramp" function, and the original user-provided function body gets moved into a newly created "actor" function. In this case `current_function_decl` points to the ramp function, but `current_binding_level->blocks` would still point to the scope block of the user-provided function body in the actor function, so when the ramp function was finished during `poplevel()` in decl.cc, we could end up with that block being reused as the `DECL_INITIAL()` of the ramp function: subblocks = functionbody >= 0 ? current_binding_level->blocks : 0; // [...] DECL_INITIAL (current_function_decl) = block ? block : subblocks; This block would then be independently modified by subsequent passes touching either the ramp or the actor function, potentially causing an ICE depending on the order and function of these passes. gcc/cp/ChangeLog: PR c++/103328 * coroutines.cc (morph_fn_to_coro): Reset current_binding_level->blocks. gcc/testsuite/ChangeLog: PR c++/103328 * g++.dg/coroutines/pr103328.C: New test. Co-Authored-By: Iain Sandoe <iain@sandoe.co.uk>
-rw-r--r--gcc/cp/coroutines.cc1
-rw-r--r--gcc/testsuite/g++.dg/coroutines/pr103328.C32
2 files changed, 33 insertions, 0 deletions
diff --git a/gcc/cp/coroutines.cc b/gcc/cp/coroutines.cc
index 23dc282..cdf6503 100644
--- a/gcc/cp/coroutines.cc
+++ b/gcc/cp/coroutines.cc
@@ -4540,6 +4540,7 @@ morph_fn_to_coro (tree orig, tree *resumer, tree *destroyer)
BIND_EXPR_BLOCK (ramp_bind) = top_block;
BLOCK_VARS (top_block) = BIND_EXPR_VARS (ramp_bind);
BLOCK_SUBBLOCKS (top_block) = NULL_TREE;
+ current_binding_level->blocks = top_block;
/* The decl_expr for the coro frame pointer, initialize to zero so that we
can pass it to the IFN_CO_FRAME (since there's no way to pass a type,
diff --git a/gcc/testsuite/g++.dg/coroutines/pr103328.C b/gcc/testsuite/g++.dg/coroutines/pr103328.C
new file mode 100644
index 0000000..56fb54a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/coroutines/pr103328.C
@@ -0,0 +1,32 @@
+// { dg-additional-options "-g" }
+
+#include <coroutine>
+
+struct task {
+ struct promise_type {
+ task get_return_object() { return {}; }
+ std::suspend_never initial_suspend() { return {}; }
+ std::suspend_never final_suspend() noexcept { return {}; }
+ void unhandled_exception() {}
+ };
+ bool await_ready() { return false; }
+ void await_suspend(std::coroutine_handle<> h) {}
+ void await_resume() {}
+};
+
+template <typename Func>
+void call(Func func) { func(); }
+
+class foo {
+ void f();
+ task g();
+};
+
+void foo::f() {
+ auto lambda = [this]() noexcept -> task {
+ co_await g();
+ };
+ (void)call<decltype(lambda)>;
+}
+
+int main() {}