Message ID | 20240912073921.453203-2-pierrick.bouvier@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Use g_assert_not_reached instead of (g_)assert(0, false) | expand |
On 9/12/24 09:38, Pierrick Bouvier wrote: > This patch is part of a series that moves towards a consistent use of > g_assert_not_reached() rather than an ad hoc mix of different > assertion mechanisms. > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> This is not C code, so please drop this patch. Paolo > --- > docs/spin/aio_notify_accept.promela | 6 +++--- > docs/spin/aio_notify_bug.promela | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/docs/spin/aio_notify_accept.promela b/docs/spin/aio_notify_accept.promela > index 9cef2c955dd..f929d303281 100644 > --- a/docs/spin/aio_notify_accept.promela > +++ b/docs/spin/aio_notify_accept.promela > @@ -118,7 +118,7 @@ accept_if_req_not_eventually_false: > if > :: req -> goto accept_if_req_not_eventually_false; > fi; > - assert(0); > + g_assert_not_reached(); > } > > #else > @@ -141,12 +141,12 @@ accept_if_event_not_eventually_true: > :: !event && notifier_done -> do :: true -> skip; od; > :: !event && !notifier_done -> goto accept_if_event_not_eventually_true; > fi; > - assert(0); > + g_assert_not_reached(); > > accept_if_event_not_eventually_false: > if > :: event -> goto accept_if_event_not_eventually_false; > fi; > - assert(0); > + g_assert_not_reached(); > } > #endif > diff --git a/docs/spin/aio_notify_bug.promela b/docs/spin/aio_notify_bug.promela > index b3bfca1ca4f..ce6f5177ed5 100644 > --- a/docs/spin/aio_notify_bug.promela > +++ b/docs/spin/aio_notify_bug.promela > @@ -106,7 +106,7 @@ accept_if_req_not_eventually_false: > if > :: req -> goto accept_if_req_not_eventually_false; > fi; > - assert(0); > + g_assert_not_reached(); > } > > #else > @@ -129,12 +129,12 @@ accept_if_event_not_eventually_true: > :: !event && notifier_done -> do :: true -> skip; od; > :: !event && !notifier_done -> goto accept_if_event_not_eventually_true; > fi; > - assert(0); > + g_assert_not_reached(); > > accept_if_event_not_eventually_false: > if > :: event -> goto accept_if_event_not_eventually_false; > fi; > - assert(0); > + g_assert_not_reached(); > } > #endif
On 9/12/24 09:14, Paolo Bonzini wrote: > On 9/12/24 09:38, Pierrick Bouvier wrote: >> This patch is part of a series that moves towards a consistent use of >> g_assert_not_reached() rather than an ad hoc mix of different >> assertion mechanisms. >> >> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> >> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > > This is not C code, so please drop this patch. Oops, yes. I didn't look close enough and thought this was documentation. r~
diff --git a/docs/spin/aio_notify_accept.promela b/docs/spin/aio_notify_accept.promela index 9cef2c955dd..f929d303281 100644 --- a/docs/spin/aio_notify_accept.promela +++ b/docs/spin/aio_notify_accept.promela @@ -118,7 +118,7 @@ accept_if_req_not_eventually_false: if :: req -> goto accept_if_req_not_eventually_false; fi; - assert(0); + g_assert_not_reached(); } #else @@ -141,12 +141,12 @@ accept_if_event_not_eventually_true: :: !event && notifier_done -> do :: true -> skip; od; :: !event && !notifier_done -> goto accept_if_event_not_eventually_true; fi; - assert(0); + g_assert_not_reached(); accept_if_event_not_eventually_false: if :: event -> goto accept_if_event_not_eventually_false; fi; - assert(0); + g_assert_not_reached(); } #endif diff --git a/docs/spin/aio_notify_bug.promela b/docs/spin/aio_notify_bug.promela index b3bfca1ca4f..ce6f5177ed5 100644 --- a/docs/spin/aio_notify_bug.promela +++ b/docs/spin/aio_notify_bug.promela @@ -106,7 +106,7 @@ accept_if_req_not_eventually_false: if :: req -> goto accept_if_req_not_eventually_false; fi; - assert(0); + g_assert_not_reached(); } #else @@ -129,12 +129,12 @@ accept_if_event_not_eventually_true: :: !event && notifier_done -> do :: true -> skip; od; :: !event && !notifier_done -> goto accept_if_event_not_eventually_true; fi; - assert(0); + g_assert_not_reached(); accept_if_event_not_eventually_false: if :: event -> goto accept_if_event_not_eventually_false; fi; - assert(0); + g_assert_not_reached(); } #endif