<html><body><div style="font-family: times new roman, new york, times, serif; font-size: 12pt; color: #000000"><blockquote style="border-left:2px solid #1010FF;margin-left:5px;padding-left:5px;color:#000;font-weight:normal;font-style:normal;text-decoration:none;font-family:Helvetica,Arial,sans-serif;font-size:12pt;"><div dir="ltr"><br><div><br></div><div class="gmail_quote"><div dir="ltr">On Mon, Jun 12, 2017 at 3:04 PM Marc-André Lureau <<a href="mailto:marcandre.lureau@redhat.com" target="_blank">marcandre.lureau@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi<br><br>
----- Original Message -----<br>
> The macro was misused and not doing static check.<br>
> Spice have other working static check macros to use.<br>
> The macro is used only by spice-common so removing it<br>
> does not cause issues to other depending projects.<br>
><br>
> Signed-off-by: Frediano Ziglio <<a href="mailto:fziglio@redhat.com" target="_blank">fziglio@redhat.com</a>><br><br><br>
ack<br><br>
(I wonder why we don't use verify() & verify_expr() directly, but this is another discussion)<br></blockquote><div><br><div><br></div>Hmm, gcc -O0 isn't smart enough it seems.. annoying<br></div></div></div></blockquote><div>well, with -O0 you are telling it to do dumb :-)<br></div><blockquote style="border-left:2px solid #1010FF;margin-left:5px;padding-left:5px;color:#000;font-weight:normal;font-style:normal;text-decoration:none;font-family:Helvetica,Arial,sans-serif;font-size:12pt;"><div dir="ltr"><div class="gmail_quote"><div> In file included from macros.h:22:0,<br> from quic.h:24,<br> from quic.c:28:<br>quic.c: In function 'find_model_params':<br>quic.c:881:41: error: expression in static assertion is not constant<br> SPICE_VERIFY(evol == 1 || evol == 3 || evol == 5);<br> ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~</div></div></div></blockquote><div>Fixed by Christophe F in master.<br></div><div><br></div><div>Yes, we should update submodule files<br></div><div><br></div><div>Thanks<br></div><blockquote style="border-left:2px solid #1010FF;margin-left:5px;padding-left:5px;color:#000;font-weight:normal;font-style:normal;text-decoration:none;font-family:Helvetica,Arial,sans-serif;font-size:12pt;"><div dir="ltr"><div class="gmail_quote"><div><br>verify.h:191:23: note: in definition of macro '_GL_VERIFY_TYPE'<br> _Static_assert (R, DIAGNOSTIC); \<br> ^<br>verify.h:246:5: note: in expansion of macro '_GL_VERIFY_TRUE'<br> (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))<br> ^~~~~~~~~~~~~~~<br>macros.h:56:28: note: in expansion of macro 'verify_expr'<br> #define SPICE_VERIFY(cond) verify_expr(cond, (void)1)<br> ^~~~~~~~~~~<br>quic.c:881:5: note: in expansion of macro 'SPICE_VERIFY'<br> SPICE_VERIFY(evol == 1 || evol == 3 || evol == 5);<br> ^~~~~~~~~~~~<br><div><br></div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
> ---<br>
> common/log.h | 5 -----<br>
> common/quic.c | 2 +-<br>
> common/quic_family_tmpl.c | 2 +-<br>
> 3 files changed, 2 insertions(+), 7 deletions(-)<br>
><br>
> diff --git a/common/log.h b/common/log.h<br>
> index 1ea2313..a4d296d 100644<br>
> --- a/common/log.h<br>
> +++ b/common/log.h<br>
> @@ -94,11 +94,6 @@ void spice_log(const char *log_domain,<br>
> } \<br>
> } G_STMT_END<br>
><br>
> -/* FIXME: improve that some day.. */<br>
> -#define spice_static_assert(x) SPICE_STMT_START { \<br>
> - spice_assert(x); \<br>
> -} SPICE_STMT_END<br>
> -<br>
> SPICE_END_DECLS<br>
><br>
> #endif /* H_SPICE_LOG */<br>
> diff --git a/common/quic.c b/common/quic.c<br>
> index 59565ae..2cd1f0d 100644<br>
> --- a/common/quic.c<br>
> +++ b/common/quic.c<br>
> @@ -888,7 +888,7 @@ static void find_model_params(Encoder *encoder,<br>
> /* The only valid values are 1, 3 and 5.<br>
> 0, 2 and 4 are obsolete and the rest of the<br>
> values are considered out of the range. */<br>
> - spice_static_assert (evol == 1 || evol == 3 || evol == 5);<br>
> + SPICE_VERIFY(evol == 1 || evol == 3 || evol == 5);<br>
> spice_assert(bpc <= 8 && bpc > 0);<br>
><br>
> *ncounters = 8;<br>
> diff --git a/common/quic_family_tmpl.c b/common/quic_family_tmpl.c<br>
> index 9a434e0..9450f44 100644<br>
> --- a/common/quic_family_tmpl.c<br>
> +++ b/common/quic_family_tmpl.c<br>
> @@ -71,7 +71,7 @@ static unsigned int FNAME(golomb_decoding)(const unsigned<br>
> int l, const unsigned<br>
> static void FNAME(update_model)(CommonState *state, s_bucket * const bucket,<br>
> const BYTE curval)<br>
> {<br>
> - spice_static_assert(BPC >= 1);<br>
> + SPICE_VERIFY(BPC >= 1);<br>
> spice_return_if_fail (bucket != NULL);<br>
><br>
> const unsigned int bpp = BPC;</blockquote></div></div></blockquote><div>Frediano<br></div><div><br></div></div></body></html>