Re: [V7][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832]
> On May 25, 2023, at 1:41 AM, Bernhard Reutner-Fischer > wrote: > > On 24 May 2023 16:09:21 CEST, Qing Zhao wrote: >> Bernhard, >> >> Thanks a lot for your comments. >> >>> On May 19, 2023, at 7:11 PM, Bernhard Reutner-Fischer >>> wrote: >>> >>> On Fri, 19 May 2023 20:49:47 + >>> Qing Zhao via Gcc-patches wrote: >>> GCC extension accepts the case when a struct with a flexible array member is embedded into another struct or union (possibly recursively). >>> >>> Do you mean TYPE_TRAILING_FLEXARRAY()? >> >> The following might be more accurate description: >> >> GCC extension accepts the case when a struct with a flexible array member >> is embedded into another struct or union (possibly recursively) as the last >> field. >> >> >> >>> diff --git a/gcc/tree.h b/gcc/tree.h index 0b72663e6a1..237644e788e 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -786,7 +786,12 @@ extern void omp_clause_range_check_failed (const_tree, const char *, int, (...) prototype, where arguments can be accessed with va_start and va_arg), as opposed to an unprototyped function. */ #define TYPE_NO_NAMED_ARGS_STDARG_P(NODE) \ - (TYPE_CHECK (NODE)->type_common.no_named_args_stdarg_p) + (FUNC_OR_METHOD_CHECK (NODE)->type_common.no_named_args_stdarg_p) + +/* True if this RECORD_TYPE or UNION_TYPE includes a flexible array member + at the last field recursively. */ +#define TYPE_INCLUDE_FLEXARRAY(NODE) \ + (RECORD_OR_UNION_CHECK (NODE)->type_common.no_named_args_stdarg_p) >>> >>> Until i read the description above i read TYPE_INCLUDE_FLEXARRAY as an >>> option to include or not include something. The description hints more >>> at TYPE_INCLUDES_FLEXARRAY (with an S) to be a type which has at least >>> one member which has a trailing flexible array or which itself has a >>> trailing flexible array. >> >> Yes, TYPE_INCLUDES_FLEXARRAY (maybe with a S is a better name) means the >> structure/union TYPE includes a flexible array member or includes a struct >> with a flexible array member as the last field. >> > > So ANY_TRAILING_FLEXARRAY or TYPE_CONTAINS_FLEXARRAY, TYPE_INCLUDES_FLEXARRAY > or something like that would be more clear, i don't know. > I'd probably use the first, but that's enough bike shedding for me now. Let's > see what others think. Thanks. I changed it to TYPE_INCLUDES_FLEXARRAY. Qing > > thanks, > >> Hope this is clear. >> thanks. >> >> Qing >>> /* In an IDENTIFIER_NODE, this means that assemble_name was called with this string as an argument. */
Re: [V7][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832]
On 24 May 2023 16:09:21 CEST, Qing Zhao wrote: >Bernhard, > >Thanks a lot for your comments. > >> On May 19, 2023, at 7:11 PM, Bernhard Reutner-Fischer >> wrote: >> >> On Fri, 19 May 2023 20:49:47 + >> Qing Zhao via Gcc-patches wrote: >> >>> GCC extension accepts the case when a struct with a flexible array member >>> is embedded into another struct or union (possibly recursively). >> >> Do you mean TYPE_TRAILING_FLEXARRAY()? > >The following might be more accurate description: > >GCC extension accepts the case when a struct with a flexible array member > is embedded into another struct or union (possibly recursively) as the last > field. > > > >> >>> diff --git a/gcc/tree.h b/gcc/tree.h >>> index 0b72663e6a1..237644e788e 100644 >>> --- a/gcc/tree.h >>> +++ b/gcc/tree.h >>> @@ -786,7 +786,12 @@ extern void omp_clause_range_check_failed (const_tree, >>> const char *, int, >>>(...) prototype, where arguments can be accessed with va_start and >>>va_arg), as opposed to an unprototyped function. */ >>> #define TYPE_NO_NAMED_ARGS_STDARG_P(NODE) \ >>> - (TYPE_CHECK (NODE)->type_common.no_named_args_stdarg_p) >>> + (FUNC_OR_METHOD_CHECK (NODE)->type_common.no_named_args_stdarg_p) >>> + >>> +/* True if this RECORD_TYPE or UNION_TYPE includes a flexible array member >>> + at the last field recursively. */ >>> +#define TYPE_INCLUDE_FLEXARRAY(NODE) \ >>> + (RECORD_OR_UNION_CHECK (NODE)->type_common.no_named_args_stdarg_p) >> >> Until i read the description above i read TYPE_INCLUDE_FLEXARRAY as an >> option to include or not include something. The description hints more >> at TYPE_INCLUDES_FLEXARRAY (with an S) to be a type which has at least >> one member which has a trailing flexible array or which itself has a >> trailing flexible array. > >Yes, TYPE_INCLUDES_FLEXARRAY (maybe with a S is a better name) means the >structure/union TYPE includes a flexible array member or includes a struct >with a flexible array member as the last field. > So ANY_TRAILING_FLEXARRAY or TYPE_CONTAINS_FLEXARRAY, TYPE_INCLUDES_FLEXARRAY or something like that would be more clear, i don't know. I'd probably use the first, but that's enough bike shedding for me now. Let's see what others think. thanks, >Hope this is clear. >thanks. > >Qing >> >>> >>> /* In an IDENTIFIER_NODE, this means that assemble_name was called with >>>this string as an argument. */ >> >
Re: [V7][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832]
Bernhard, Thanks a lot for your comments. > On May 19, 2023, at 7:11 PM, Bernhard Reutner-Fischer > wrote: > > On Fri, 19 May 2023 20:49:47 + > Qing Zhao via Gcc-patches wrote: > >> GCC extension accepts the case when a struct with a flexible array member >> is embedded into another struct or union (possibly recursively). > > Do you mean TYPE_TRAILING_FLEXARRAY()? The following might be more accurate description: GCC extension accepts the case when a struct with a flexible array member is embedded into another struct or union (possibly recursively) as the last field. > >> diff --git a/gcc/tree.h b/gcc/tree.h >> index 0b72663e6a1..237644e788e 100644 >> --- a/gcc/tree.h >> +++ b/gcc/tree.h >> @@ -786,7 +786,12 @@ extern void omp_clause_range_check_failed (const_tree, >> const char *, int, >>(...) prototype, where arguments can be accessed with va_start and >>va_arg), as opposed to an unprototyped function. */ >> #define TYPE_NO_NAMED_ARGS_STDARG_P(NODE) \ >> - (TYPE_CHECK (NODE)->type_common.no_named_args_stdarg_p) >> + (FUNC_OR_METHOD_CHECK (NODE)->type_common.no_named_args_stdarg_p) >> + >> +/* True if this RECORD_TYPE or UNION_TYPE includes a flexible array member >> + at the last field recursively. */ >> +#define TYPE_INCLUDE_FLEXARRAY(NODE) \ >> + (RECORD_OR_UNION_CHECK (NODE)->type_common.no_named_args_stdarg_p) > > Until i read the description above i read TYPE_INCLUDE_FLEXARRAY as an > option to include or not include something. The description hints more > at TYPE_INCLUDES_FLEXARRAY (with an S) to be a type which has at least > one member which has a trailing flexible array or which itself has a > trailing flexible array. Yes, TYPE_INCLUDES_FLEXARRAY (maybe with a S is a better name) means the structure/union TYPE includes a flexible array member or includes a struct with a flexible array member as the last field. Hope this is clear. thanks. Qing > >> >> /* In an IDENTIFIER_NODE, this means that assemble_name was called with >>this string as an argument. */ >
Re: [V7][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832]
On Fri, 19 May 2023 20:49:47 + Qing Zhao via Gcc-patches wrote: > GCC extension accepts the case when a struct with a flexible array member > is embedded into another struct or union (possibly recursively). Do you mean TYPE_TRAILING_FLEXARRAY()? > diff --git a/gcc/tree.h b/gcc/tree.h > index 0b72663e6a1..237644e788e 100644 > --- a/gcc/tree.h > +++ b/gcc/tree.h > @@ -786,7 +786,12 @@ extern void omp_clause_range_check_failed (const_tree, > const char *, int, > (...) prototype, where arguments can be accessed with va_start and > va_arg), as opposed to an unprototyped function. */ > #define TYPE_NO_NAMED_ARGS_STDARG_P(NODE) \ > - (TYPE_CHECK (NODE)->type_common.no_named_args_stdarg_p) > + (FUNC_OR_METHOD_CHECK (NODE)->type_common.no_named_args_stdarg_p) > + > +/* True if this RECORD_TYPE or UNION_TYPE includes a flexible array member > + at the last field recursively. */ > +#define TYPE_INCLUDE_FLEXARRAY(NODE) \ > + (RECORD_OR_UNION_CHECK (NODE)->type_common.no_named_args_stdarg_p) Until i read the description above i read TYPE_INCLUDE_FLEXARRAY as an option to include or not include something. The description hints more at TYPE_INCLUDES_FLEXARRAY (with an S) to be a type which has at least one member which has a trailing flexible array or which itself has a trailing flexible array. > > /* In an IDENTIFIER_NODE, this means that assemble_name was called with > this string as an argument. */
[V7][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832]
GCC extension accepts the case when a struct with a flexible array member
is embedded into another struct or union (possibly recursively).
__builtin_object_size should treat such struct as flexible size.
gcc/c/ChangeLog:
PR tree-optimization/101832
* c-decl.cc (finish_struct): Set TYPE_INCLUDE_FLEXARRAY for
struct/union type.
gcc/lto/ChangeLog:
PR tree-optimization/101832
* lto-common.cc (compare_tree_sccs_1): Compare bit
TYPE_NO_NAMED_ARGS_STDARG_P or TYPE_INCLUDE_FLEXARRAY properly
for its corresponding type.
gcc/ChangeLog:
PR tree-optimization/101832
* print-tree.cc (print_node): Print new bit type_include_flexarray.
* tree-core.h (struct tree_type_common): Use bit no_named_args_stdarg_p
as type_include_flexarray for RECORD_TYPE or UNION_TYPE.
* tree-object-size.cc (addr_object_size): Handle structure/union type
when it has flexible size.
* tree-streamer-in.cc (unpack_ts_type_common_value_fields): Stream
in bit no_named_args_stdarg_p properly for its corresponding type.
* tree-streamer-out.cc (pack_ts_type_common_value_fields): Stream
out bit no_named_args_stdarg_p properly for its corresponding type.
* tree.h (TYPE_INCLUDE_FLEXARRAY): New macro TYPE_INCLUDE_FLEXARRAY.
gcc/testsuite/ChangeLog:
PR tree-optimization/101832
* gcc.dg/builtin-object-size-pr101832.c: New test.
---
gcc/c/c-decl.cc | 11 ++
gcc/lto/lto-common.cc | 5 +-
gcc/print-tree.cc | 5 +
.../gcc.dg/builtin-object-size-pr101832.c | 134 ++
gcc/tree-core.h | 2 +
gcc/tree-object-size.cc | 23 ++-
gcc/tree-streamer-in.cc | 5 +-
gcc/tree-streamer-out.cc | 5 +-
gcc/tree.h| 7 +-
9 files changed, 192 insertions(+), 5 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/builtin-object-size-pr101832.c
diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc
index b5b491cf2da..2c620b681d9 100644
--- a/gcc/c/c-decl.cc
+++ b/gcc/c/c-decl.cc
@@ -9282,6 +9282,17 @@ finish_struct (location_t loc, tree t, tree fieldlist,
tree attributes,
/* Set DECL_NOT_FLEXARRAY flag for FIELD_DECL x. */
DECL_NOT_FLEXARRAY (x) = !is_flexible_array_member_p (is_last_field, x);
+ /* Set TYPE_INCLUDE_FLEXARRAY for the context of x, t.
+when x is an array and is the last field. */
+ if (TREE_CODE (TREE_TYPE (x)) == ARRAY_TYPE)
+ TYPE_INCLUDE_FLEXARRAY (t)
+ = is_last_field && flexible_array_member_type_p (TREE_TYPE (x));
+ /* Recursively set TYPE_INCLUDE_FLEXARRAY for the context of x, t
+when x is an union or record and is the last field. */
+ else if (RECORD_OR_UNION_TYPE_P (TREE_TYPE (x)))
+ TYPE_INCLUDE_FLEXARRAY (t)
+ = is_last_field && TYPE_INCLUDE_FLEXARRAY (TREE_TYPE (x));
+
if (DECL_NAME (x)
|| RECORD_OR_UNION_TYPE_P (TREE_TYPE (x)))
saw_named_field = true;
diff --git a/gcc/lto/lto-common.cc b/gcc/lto/lto-common.cc
index 537570204b3..35827aab075 100644
--- a/gcc/lto/lto-common.cc
+++ b/gcc/lto/lto-common.cc
@@ -1275,7 +1275,10 @@ compare_tree_sccs_1 (tree t1, tree t2, tree **map)
if (AGGREGATE_TYPE_P (t1))
compare_values (TYPE_TYPELESS_STORAGE);
compare_values (TYPE_EMPTY_P);
- compare_values (TYPE_NO_NAMED_ARGS_STDARG_P);
+ if (FUNC_OR_METHOD_TYPE_P (t1))
+ compare_values (TYPE_NO_NAMED_ARGS_STDARG_P);
+ if (RECORD_OR_UNION_TYPE_P (t1))
+ compare_values (TYPE_INCLUDE_FLEXARRAY);
compare_values (TYPE_PACKED);
compare_values (TYPE_RESTRICT);
compare_values (TYPE_USER_ALIGN);
diff --git a/gcc/print-tree.cc b/gcc/print-tree.cc
index ccecd3dc6a7..aaded53b1b1 100644
--- a/gcc/print-tree.cc
+++ b/gcc/print-tree.cc
@@ -632,6 +632,11 @@ print_node (FILE *file, const char *prefix, tree node, int
indent,
&& TYPE_CXX_ODR_P (node))
fputs (" cxx-odr-p", file);
+ if ((code == RECORD_TYPE
+ || code == UNION_TYPE)
+ && TYPE_INCLUDE_FLEXARRAY (node))
+ fputs (" include-flexarray", file);
+
/* The transparent-union flag is used for different things in
different nodes. */
if ((code == UNION_TYPE || code == RECORD_TYPE)
diff --git a/gcc/testsuite/gcc.dg/builtin-object-size-pr101832.c
b/gcc/testsuite/gcc.dg/builtin-object-size-pr101832.c
new file mode 100644
index 000..60078e11634
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/builtin-object-size-pr101832.c
@@ -0,0 +1,134 @@
+/* PR 101832:
+ GCC extension accepts the case when a struct with a C99 flexible array
+ member is embedded into another struct (possibly recursively).
+ __builtin_object_size will treat such struct as flexible size.
+ However, when a structure with
