PR c++/55032

	* tree.c (build_array_type_1): Re-layout if we found it in the
	hash table.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@194286 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 45e613e..80e72a9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-06  Jason Merrill  <jason@redhat.com>
+
+       PR c++/55032
+       * tree.c (build_array_type_1): Re-layout if we found it in the
+       hash table.
+
 2012-12-05  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        Backport for mainline:

diff --git a/gcc/testsuite/g++.dg/template/array24.C b/gcc/testsuite/g++.dg/template/array24.C
new file mode 100644 (file)
index 0000000..07879d2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/array24.C
@@ -0,0 +1,22 @@
+// PR c++/55032
+
+template<typename T>
+struct vec3t {
+  T c[3];
+};
+
+typedef vec3t<float> vec3;
+
+class Bounds {
+  public:
+    Bounds(const vec3 bb[2]);
+    void foo(const vec3 & v) { v.c[0]; }
+};
+
+template<typename T>
+void work(T& value);
+
+void foo() {
+  vec3 bb[2];
+  work(bb);
+}

diff --git a/gcc/tree.c b/gcc/tree.c
index 83a0711..7a0ac82 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -7282,10 +7282,15 @@ build_array_type_1 (tree elt_type, tree index_type, bool shared)
 
   if (shared)
     {
+      tree old_t = t;
       hashval_t hashcode = iterative_hash_object (TYPE_HASH (elt_type), 0);
       if (index_type)
        hashcode = iterative_hash_object (TYPE_HASH (index_type), hashcode);
       t = type_hash_canon (hashcode, t);
+      if (t != old_t)
+       /* Lay it out again in case the element type has been completed since
+          the array was added to the hash table.  */
+       layout_type (t);
     }
 
   if (TYPE_CANONICAL (t) == t)