backport: re PR c++/84767 (ICE with pointer to VLA)

	Backported from mainline
	2018-03-09  Jakub Jelinek  <jakub@redhat.com>

	PR c++/84767
	* tree-inline.c (copy_tree_body_r): For INDIRECT_REF of a remapped
	decl, use remap_type if we want to use the type.

	* g++.dg/ext/vla18.C: New test.

From-SVN: r261916

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 89485229092ec2601c80120021049b7a1afbadfd..f00be0c914b4c3572da122fdfb9d41730fa406f0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2018-06-22  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-03-09  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/84767
+       * tree-inline.c (copy_tree_body_r): For INDIRECT_REF of a remapped
+       decl, use remap_type if we want to use the type.
+
        2018-03-08  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/84739

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a00300dfb6ad754bd849f5f62b8af20eb3085ebf..10e1880184c36f0e78b14d5cc2da4d59ef21a3d0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2018-06-22  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-03-09  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/84767
+       * g++.dg/ext/vla18.C: New test.
+
        2018-03-08  Jason Merrill  <jason@redhat.com>
                    Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/gcc/testsuite/g++.dg/ext/vla18.C b/gcc/testsuite/g++.dg/ext/vla18.C
new file mode 100644 (file)
index 0000000..31a1bb3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/vla18.C
@@ -0,0 +1,19 @@
+// PR c++/84767
+// { dg-do compile }
+// { dg-options "" }
+
+int v[1][10];
+
+struct A
+{
+  A (int);
+};
+
+A::A (int i)
+{
+  typedef int T[1][i];
+  T *x = (T *) v;
+  (*x)[0][0] = 0;
+}
+
+A a = 10;

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 92c861383a28e9c82daa8c518cf08530396e8101..eae7953a66007829022ebba8c173ccb74e31344f 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1183,6 +1183,7 @@ copy_tree_body_r (tree *tp, int *walk_subtrees, void *data)
              *tp = gimple_fold_indirect_ref (ptr);
              if (! *tp)
                {
+                 type = remap_type (type, id);
                  if (TREE_CODE (ptr) == ADDR_EXPR)
                    {
                      *tp