Patchwork Use gdb_static_assert in charset.c

login
register
mail settings
Submitter Doug Evans via gdb-patches
Date Oct. 7, 2019, 5:35 p.m.
Message ID <20191007173510.250346-1-cbiesinger@google.com>
Download mbox | patch
Permalink /patch/34851/
State New
Headers show

Comments

Doug Evans via gdb-patches - Oct. 7, 2019, 5:35 p.m.
It currently has a "manual" static assert.

gdb/ChangeLog:

2019-10-07  Christian Biesinger  <cbiesinger@google.com>

	* charset.c (your_gdb_wchar_t_is_bogus): Replace with a
	gdb_static_assert.
---
 gdb/charset.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
Simon Marchi - Oct. 7, 2019, 5:46 p.m.
On 2019-10-07 1:35 p.m., Christian Biesinger via gdb-patches wrote:
> It currently has a "manual" static assert.
> 
> gdb/ChangeLog:
> 
> 2019-10-07  Christian Biesinger  <cbiesinger@google.com>
> 
> 	* charset.c (your_gdb_wchar_t_is_bogus): Replace with a
> 	gdb_static_assert.
> ---
>  gdb/charset.c | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/gdb/charset.c b/gdb/charset.c
> index 9df46c0c74d..73131651a6d 100644
> --- a/gdb/charset.c
> +++ b/gdb/charset.c
> @@ -946,15 +946,9 @@ default_auto_wide_charset (void)
>  #define ENDIAN_SUFFIX "LE"
>  #endif
>  
> -/* The code below serves to generate a compile time error if
> -   gdb_wchar_t type is not of size 2 nor 4, despite the fact that
> -   macro __STDC_ISO_10646__ is defined.
> -   This is better than a gdb_assert call, because GDB cannot handle
> -   strings correctly if this size is different.  */
> -
> -extern char your_gdb_wchar_t_is_bogus[(sizeof (gdb_wchar_t) == 2
> -				       || sizeof (gdb_wchar_t) == 4)
> -				      ? 1 : -1];
> +/* GDB cannot handle strings correctly if this size is different.  */
> +
> +gdb_static_assert (sizeof (gdb_wchar_t) == 2 || sizeof (gdb_wchar_t) == 4);
>  
>  /* intermediate_encoding returns the charset used internally by
>     GDB to convert between target and host encodings. As the test above
> 

Thanks, LGTM.

Simon
Doug Evans via gdb-patches - Oct. 7, 2019, 5:50 p.m.
On Mon, Oct 7, 2019 at 12:46 PM Simon Marchi <simark@simark.ca> wrote:
>
> On 2019-10-07 1:35 p.m., Christian Biesinger via gdb-patches wrote:
> > It currently has a "manual" static assert.
> >
> > gdb/ChangeLog:
> >
> > 2019-10-07  Christian Biesinger  <cbiesinger@google.com>
> >
> >       * charset.c (your_gdb_wchar_t_is_bogus): Replace with a
> >       gdb_static_assert.
> > ---
> >  gdb/charset.c | 12 +++---------
> >  1 file changed, 3 insertions(+), 9 deletions(-)
> >
> > diff --git a/gdb/charset.c b/gdb/charset.c
> > index 9df46c0c74d..73131651a6d 100644
> > --- a/gdb/charset.c
> > +++ b/gdb/charset.c
> > @@ -946,15 +946,9 @@ default_auto_wide_charset (void)
> >  #define ENDIAN_SUFFIX "LE"
> >  #endif
> >
> > -/* The code below serves to generate a compile time error if
> > -   gdb_wchar_t type is not of size 2 nor 4, despite the fact that
> > -   macro __STDC_ISO_10646__ is defined.
> > -   This is better than a gdb_assert call, because GDB cannot handle
> > -   strings correctly if this size is different.  */
> > -
> > -extern char your_gdb_wchar_t_is_bogus[(sizeof (gdb_wchar_t) == 2
> > -                                    || sizeof (gdb_wchar_t) == 4)
> > -                                   ? 1 : -1];
> > +/* GDB cannot handle strings correctly if this size is different.  */
> > +
> > +gdb_static_assert (sizeof (gdb_wchar_t) == 2 || sizeof (gdb_wchar_t) == 4);
> >
> >  /* intermediate_encoding returns the charset used internally by
> >     GDB to convert between target and host encodings. As the test above
> >
>
> Thanks, LGTM.

Thanks, pushed.

Christian

Patch

diff --git a/gdb/charset.c b/gdb/charset.c
index 9df46c0c74d..73131651a6d 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -946,15 +946,9 @@  default_auto_wide_charset (void)
 #define ENDIAN_SUFFIX "LE"
 #endif
 
-/* The code below serves to generate a compile time error if
-   gdb_wchar_t type is not of size 2 nor 4, despite the fact that
-   macro __STDC_ISO_10646__ is defined.
-   This is better than a gdb_assert call, because GDB cannot handle
-   strings correctly if this size is different.  */
-
-extern char your_gdb_wchar_t_is_bogus[(sizeof (gdb_wchar_t) == 2
-				       || sizeof (gdb_wchar_t) == 4)
-				      ? 1 : -1];
+/* GDB cannot handle strings correctly if this size is different.  */
+
+gdb_static_assert (sizeof (gdb_wchar_t) == 2 || sizeof (gdb_wchar_t) == 4);
 
 /* intermediate_encoding returns the charset used internally by
    GDB to convert between target and host encodings. As the test above