From: Jakub Jelinek Date: Fri, 22 Jun 2018 21:08:00 +0000 (+0200) Subject: backport: re PR debug/85252 (ICE with -g for static zero-length array initialization) X-Git-Tag: releases/gcc-7.4.0~339 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b42eb87dccf59fdb4ee63020caf3f41677a0763;p=thirdparty%2Fgcc.git backport: re PR debug/85252 (ICE with -g for static zero-length array initialization) Backported from mainline 2018-04-06 Jakub Jelinek PR debug/85252 * dwarf2out.c (rtl_for_decl_init): For STRING_CST initializer only build CONST_STRING if TYPE_MAX_VALUE is non-NULL and is INTEGER_CST. * gcc.dg/debug/pr85252.c: New test. From-SVN: r261950 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dd6bc807df06..27d2c31947b1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,12 @@ 2018-06-22 Jakub Jelinek Backported from mainline + 2018-04-06 Jakub Jelinek + + PR debug/85252 + * dwarf2out.c (rtl_for_decl_init): For STRING_CST initializer only + build CONST_STRING if TYPE_MAX_VALUE is non-NULL and is INTEGER_CST. + 2018-04-03 Jakub Jelinek PR rtl-optimization/85167 diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 43bb121fb21c..7e1ce9e152a7 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -18749,6 +18749,8 @@ rtl_for_decl_init (tree init, tree type) if (GET_MODE_CLASS (mode) == MODE_INT && GET_MODE_SIZE (mode) == 1 && domain + && TYPE_MAX_VALUE (domain) + && TREE_CODE (TYPE_MAX_VALUE (domain)) == INTEGER_CST && integer_zerop (TYPE_MIN_VALUE (domain)) && compare_tree_int (TYPE_MAX_VALUE (domain), TREE_STRING_LENGTH (init) - 1) == 0 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0fd38c54cbe9..42d07edd3f0b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -3,6 +3,9 @@ Backported from mainline 2018-04-06 Jakub Jelinek + PR debug/85252 + * gcc.dg/debug/pr85252.c: New test. + PR c++/85210 * g++.dg/cpp1z/decomp42.C: New test. diff --git a/gcc/testsuite/gcc.dg/debug/pr85252.c b/gcc/testsuite/gcc.dg/debug/pr85252.c new file mode 100644 index 000000000000..6e5ca85bc868 --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/pr85252.c @@ -0,0 +1,11 @@ +/* PR debug/85252 */ +/* { dg-do compile } */ + +void +foo (void) +{ + static char a[0] = ""; + static char b[0] = "b"; /* { dg-warning "initializer-string for array of chars is too long" } */ + static char c[1] = "c"; + static char d[1] = "de"; /* { dg-warning "initializer-string for array of chars is too long" } */ +}