On Sun, May 6, 2018 at 1:56 PM, Jakub Jelinek <ja...@redhat.com> wrote: > --- gcc/c-family/c-common.c.jj 2018-03-27 21:58:55.598502113 +0200 > +++ gcc/c-family/c-common.c 2018-05-05 10:55:47.951600802 +0200 > @@ -6171,7 +6171,7 @@ c_common_to_target_charset (HOST_WIDE_IN > traditional rendering of offsetof as a macro. Return the folded result. > */ > > tree > -fold_offsetof_1 (tree expr, enum tree_code ctx) > +fold_offsetof_1 (tree expr, bool nonptr, enum tree_code ctx)
The comment needs to document the NONPTR parameter. > @@ -6287,7 +6291,7 @@ fold_offsetof_1 (tree expr, enum tree_co > tree > fold_offsetof (tree expr) > { > - return convert (size_type_node, fold_offsetof_1 (expr)); > + return convert (size_type_node, fold_offsetof_1 (expr, true)); > } Since all the uses of fold_offset_1 involve converting to a particular type, I wonder about wrapping it so that the argument for nonptr is determined from that type. Jason