On 08/01/18 22:43, Joseph Myers wrote:
> On Wed, 1 Aug 2018, Marek Polacek wrote:
>
>> I guess you want XALLOCAVAR or XNEWVAR.
>
> Not XALLOCAVAR; GCC supports string constants up to 2 GB (minus one byte),
> which is far too much to put on the stack.
>
I assume you want me to use XNEWVEC/XDELETEVEC.
Attached is a new version using those macros.
Is it OK for trunk?
Thanks
Bernd.
2018-08-01 Bernd Edlinger <bernd.edlin...@hotmail.de>
* c-typeck.c (digest_init): Shorten overlength strings.
Index: gcc/c/c-typeck.c
===================================================================
--- gcc/c/c-typeck.c (revision 263072)
+++ gcc/c/c-typeck.c (working copy)
@@ -7435,19 +7435,17 @@ digest_init (location_t init_loc, tree type, tree
}
}
- TREE_TYPE (inside_init) = type;
if (TYPE_DOMAIN (type) != NULL_TREE
&& TYPE_SIZE (type) != NULL_TREE
&& TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST)
{
unsigned HOST_WIDE_INT len = TREE_STRING_LENGTH (inside_init);
+ unsigned unit = TYPE_PRECISION (typ1) / BITS_PER_UNIT;
/* Subtract the size of a single (possibly wide) character
because it's ok to ignore the terminating null char
that is counted in the length of the constant. */
- if (compare_tree_int (TYPE_SIZE_UNIT (type),
- (len - (TYPE_PRECISION (typ1)
- / BITS_PER_UNIT))) < 0)
+ if (compare_tree_int (TYPE_SIZE_UNIT (type), len - unit) < 0)
pedwarn_init (init_loc, 0,
("initializer-string for array of chars "
"is too long"));
@@ -7456,8 +7454,21 @@ digest_init (location_t init_loc, tree type, tree
warning_at (init_loc, OPT_Wc___compat,
("initializer-string for array chars "
"is too long for C++"));
+ if (compare_tree_int (TYPE_SIZE_UNIT (type), len) < 0)
+ {
+ unsigned HOST_WIDE_INT size
+ = tree_to_uhwi (TYPE_SIZE_UNIT (type));
+ const char *p = TREE_STRING_POINTER (inside_init);
+ char *q = XNEWVEC (char, size + unit);
+
+ memcpy (q, p, size);
+ memset (q + size, 0, unit);
+ inside_init = build_string (size + unit, q);
+ XDELETEVEC (q);
+ }
}
+ TREE_TYPE (inside_init) = type;
return inside_init;
}
else if (INTEGRAL_TYPE_P (typ1))
