diff options
| -rw-r--r-- | gcc/c/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/c/c-typeck.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr67410.c | 15 |
4 files changed, 31 insertions, 1 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 62701f0..522da71 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,11 @@ +2016-08-12 Jakub Jelinek <jakub@redhat.com> + Martin Liska <mliska@suse.cz> + + PR c/67410 + * c-typeck.c (set_nonincremental_init_from_string): Use / instead of + % to determine val element to change. Assert that + wchar_bytes * charwidth fits into val array. + 2016-08-12 Marek Polacek <polacek@redhat.com> PR c/7652 diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 8456a0c..2e1e09d 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -8558,6 +8558,8 @@ set_nonincremental_init_from_string (tree str, wchar_bytes = TYPE_PRECISION (TREE_TYPE (TREE_TYPE (str))) / BITS_PER_UNIT; charwidth = TYPE_PRECISION (char_type_node); + gcc_assert ((size_t) wchar_bytes * charwidth + <= ARRAY_SIZE (val) * HOST_BITS_PER_WIDE_INT); type = TREE_TYPE (constructor_type); p = TREE_STRING_POINTER (str); end = p + TREE_STRING_LENGTH (str); @@ -8583,7 +8585,7 @@ set_nonincremental_init_from_string (tree str, bitpos = (wchar_bytes - byte - 1) * charwidth; else bitpos = byte * charwidth; - val[bitpos % HOST_BITS_PER_WIDE_INT] + val[bitpos / HOST_BITS_PER_WIDE_INT] |= ((unsigned HOST_WIDE_INT) ((unsigned char) *p++)) << (bitpos % HOST_BITS_PER_WIDE_INT); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5ad718d..8040f34 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-08-12 Jakub Jelinek <jakub@redhat.com> + + PR c/67410 + * gcc.dg/pr67410.c: New test. + 2016-08-12 Bin Cheng <bin.cheng@arm.com> PR tree-optimization/69848 diff --git a/gcc/testsuite/gcc.dg/pr67410.c b/gcc/testsuite/gcc.dg/pr67410.c new file mode 100644 index 0000000..ff3c4f1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr67410.c @@ -0,0 +1,15 @@ +/* PR c/67410 */ +/* { dg-do run } */ +/* { dg-options "-std=gnu11" } */ + +struct { + __CHAR16_TYPE__ s[2]; +} a[] = { u"ff", [0].s[0] = u'x', [1] = u"\u1234\u4567", [1].s[0] = u'\u89ab' }; + +int +main () +{ + if (a[0].s[0] != u'x' || a[0].s[1] != u'f' || a[1].s[0] != u'\u89ab' || a[1].s[1] != u'\u4567') + __builtin_abort (); + return 0; +} |