diff options
| author | Richard Biener <rguenther@suse.de> | 2017-11-02 08:28:18 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2017-11-02 08:28:18 +0000 |
| commit | a4d758d005722358ce73ac1b31fea68358667e83 (patch) | |
| tree | a29ae71e7c2e948a8d7bc9e9219c90dc1ff37333 /gcc | |
| parent | 30d124e1e6c41c7f08651e9551d702627d2bb5fd (diff) | |
| download | gcc-a4d758d005722358ce73ac1b31fea68358667e83.zip gcc-a4d758d005722358ce73ac1b31fea68358667e83.tar.gz gcc-a4d758d005722358ce73ac1b31fea68358667e83.tar.bz2 | |
re PR c/82765 (ICE at -Os on valid code on x86_64-linux-gnu: in tree_to_shwi, at tree.c:6611)
2017-11-02 Richard Biener <rguenther@suse.de>
PR middle-end/82765
* varasm.c (decode_addr_const): Make offset HOST_WIDE_INT.
Truncate ARRAY_REF index and element size.
* gcc.dg/pr82765.c: New testcase.
From-SVN: r254337
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr82765.c | 5 | ||||
| -rw-r--r-- | gcc/varasm.c | 7 |
4 files changed, 20 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 40267c3..fc871f8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-11-02 Richard Biener <rguenther@suse.de> + + PR middle-end/82765 + * varasm.c (decode_addr_const): Make offset HOST_WIDE_INT. + Truncate ARRAY_REF index and element size. + 2017-11-01 Palmer Dabbelt <palmer@dabbelt.com> * doc/invoke.texi (RISC-V Options): Use "@minus{}2 GB", not "-2 GB". diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8046bb1..3556b86 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-11-02 Richard Biener <rguenther@suse.de> + + PR middle-end/82765 + * gcc.dg/pr82765.c: New testcase. + 2017-11-02 Tom de Vries <tom@codesourcery.com> * gfortran.dg/implied_do_io_1.f90: Fix scan-tree-dump-times pattern. diff --git a/gcc/testsuite/gcc.dg/pr82765.c b/gcc/testsuite/gcc.dg/pr82765.c new file mode 100644 index 0000000..dde0aeb --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr82765.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-Os -w" } */ + +int a[1][1]; +int main() { int *b[] = {a, a[1820408606019012862278468], a, a, a}; } diff --git a/gcc/varasm.c b/gcc/varasm.c index 655324e..1b35a99 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -2879,7 +2879,7 @@ static void decode_addr_const (tree exp, struct addr_const *value) { tree target = TREE_OPERAND (exp, 0); - int offset = 0; + HOST_WIDE_INT offset = 0; rtx x; while (1) @@ -2893,8 +2893,9 @@ decode_addr_const (tree exp, struct addr_const *value) else if (TREE_CODE (target) == ARRAY_REF || TREE_CODE (target) == ARRAY_RANGE_REF) { - offset += (tree_to_uhwi (TYPE_SIZE_UNIT (TREE_TYPE (target))) - * tree_to_shwi (TREE_OPERAND (target, 1))); + /* Truncate big offset. */ + offset += (TREE_INT_CST_LOW (TYPE_SIZE_UNIT (TREE_TYPE (target))) + * TREE_INT_CST_LOW (TREE_OPERAND (target, 1))); target = TREE_OPERAND (target, 0); } else if (TREE_CODE (target) == MEM_REF |