diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2014-10-13 16:43:24 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2014-10-13 14:43:24 +0000 |
| commit | daaf6209a4b83e4fdd8a0b744833399169e282e9 (patch) | |
| tree | 0ad6305f1184964cd9f3873141578db39f38c54c /gcc | |
| parent | 01d6452fe545c30b8f9c9cb1a270d923aa572848 (diff) | |
| download | gcc-daaf6209a4b83e4fdd8a0b744833399169e282e9.zip gcc-daaf6209a4b83e4fdd8a0b744833399169e282e9.tar.gz gcc-daaf6209a4b83e4fdd8a0b744833399169e282e9.tar.bz2 | |
re PR c++/62127 (ICE with VLA in constructor)
PR tree-optimization/62127
* g++.dg/torture/pr62127.C: New testcase.
* tree.c (remap_type_1): When remapping array, remap
also its type.
From-SVN: r216150
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/torture/pr62127.C | 11 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 2 |
4 files changed, 24 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9e35d69b..36b5abb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-10-13 Jan Hubicka <hubicka@ucw.cz> + + PR tree-optimization/62127 + * tree.c (remap_type_1): When remapping array, remap + also its type. + 2014-10-13 Christophe Lyon <christophe.lyon@linaro.org> * Makefile.in: (check-%): Update comment, as RUNTESTFLAGS no diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2134ada..c1dce8b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-10-13 Jan Hubicka <hubicka@ucw.cz> + + PR tree-optimization/62127 + * g++.dg/torture/pr62127.C: New testcase. + 2014-09-19 Marat Zakirov <m.zakirov@samsung.com> * c-c++-common/asan/bitfield-5.c: New test. diff --git a/gcc/testsuite/g++.dg/torture/pr62127.C b/gcc/testsuite/g++.dg/torture/pr62127.C new file mode 100644 index 0000000..7b83a26 --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr62127.C @@ -0,0 +1,11 @@ +// { dg-do compile } +struct A +{ + A(int); +}; + +A::A(int i) +{ + int x[1][i]; + x[0][0] = 0; +} diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 4583899..a817989 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -496,6 +496,8 @@ remap_type_1 (tree type, copy_body_data *id) if (TYPE_MAIN_VARIANT (new_tree) != new_tree && TREE_TYPE (type) == TREE_TYPE (TYPE_MAIN_VARIANT (type))) TREE_TYPE (new_tree) = TREE_TYPE (TYPE_MAIN_VARIANT (new_tree)); + else + TREE_TYPE (new_tree) = remap_type (TREE_TYPE (new_tree), id); if (TYPE_MAIN_VARIANT (new_tree) != new_tree) { |