From f6615c213354fd3ec7fc6238e61cc26bb1830464 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Tue, 26 May 2020 08:57:32 +0100 Subject: [PATCH] coroutines, testsuite: Fix co-ret-17-void-ret-coro.C. This was a bad testcase, found with fsanitize=address; the final suspend is 'suspend never' which flows off the end of the coroutine destroying the promise and the frame. At that point access via the handle is an error. Fixed by checking that the promise is destroyed via a global var. gcc/testsuite/ChangeLog: * g++.dg/coroutines/torture/co-ret-17-void-ret-coro.C: Check for promise destruction via a global variable. --- .../g++.dg/coroutines/torture/co-ret-17-void-ret-coro.C | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/g++.dg/coroutines/torture/co-ret-17-void-ret-coro.C b/gcc/testsuite/g++.dg/coroutines/torture/co-ret-17-void-ret-coro.C index 3168ea2..01a75c1 100644 --- a/gcc/testsuite/g++.dg/coroutines/torture/co-ret-17-void-ret-coro.C +++ b/gcc/testsuite/g++.dg/coroutines/torture/co-ret-17-void-ret-coro.C @@ -5,14 +5,17 @@ #include "../coro.h" +int g_promise = -1; + template struct std::coroutine_traits { struct promise_type { promise_type (HandleRef h, T ...args) { h = std::coroutine_handle::from_promise (*this); PRINT ("Created Promise"); + g_promise = 1; } - + ~promise_type () { PRINT ("Destroyed Promise"); g_promise = 0;} void get_return_object() {} auto initial_suspend() { @@ -45,10 +48,11 @@ int main () // initial suspend. h.resume (); - - if (!h.done()) + + // The coro should have self-destructed. + if (g_promise) { - PRINT ("main: apparently wasn't done..."); + PRINT ("main: apparently we did not complete..."); abort (); } -- 2.7.4