re PR c++/90108 (ICE: Segmentation fault (in c_tree_chain_next))

	PR c++/90108
	* c-decl.c (merge_decls): If remove is main variant and
	DECL_ORIGINAL_TYPE is some other type, remove a DECL_ORIGINAL_TYPE
	variant that has newdecl as TYPE_NAME if any.

	* decl.c (duplicate_decls): If remove is main variant and
	DECL_ORIGINAL_TYPE is some other type, remove a DECL_ORIGINAL_TYPE
	variant that has newdecl as TYPE_NAME if any.

	* c-c++-common/pr90108.c: New test.

From-SVN: r270453

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index c8e5e1a6b0bee21d6d119319dfa835a7c41bab88..27660b98e7dd6007a2dcd9e924c241c9c3abf71d 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,10 @@
+2019-04-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/90108
+       * c-decl.c (merge_decls): If remove is main variant and
+       DECL_ORIGINAL_TYPE is some other type, remove a DECL_ORIGINAL_TYPE
+       variant that has newdecl as TYPE_NAME if any.
+
 2019-04-12  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/89933

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index ef9b874f997762cd456736c426d9281c95dc49b1..c8e7cd01d9ec1abe5c6255ea2f41b282b474e0f0 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -2513,7 +2513,24 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
        {
          tree remove = TREE_TYPE (newdecl);
          if (TYPE_MAIN_VARIANT (remove) == remove)
-           gcc_assert (TYPE_NEXT_VARIANT (remove) == NULL_TREE);
+           {
+             gcc_assert (TYPE_NEXT_VARIANT (remove) == NULL_TREE);
+             /* If remove is the main variant, no need to remove that
+                from the list.  One of the DECL_ORIGINAL_TYPE
+                variants, e.g. created for aligned attribute, might still
+                refer to the newdecl TYPE_DECL though, so remove that one
+                in that case.  */
+             if (DECL_ORIGINAL_TYPE (newdecl)
+                 && DECL_ORIGINAL_TYPE (newdecl) != remove)
+               for (tree t = TYPE_MAIN_VARIANT (DECL_ORIGINAL_TYPE (newdecl));
+                    t; t = TYPE_MAIN_VARIANT (t))
+                 if (TYPE_NAME (TYPE_NEXT_VARIANT (t)) == newdecl)
+                   {
+                     TYPE_NEXT_VARIANT (t)
+                       = TYPE_NEXT_VARIANT (TYPE_NEXT_VARIANT (t));
+                     break;
+                   }
+           }       
          else
            for (tree t = TYPE_MAIN_VARIANT (remove); ;
                 t = TYPE_NEXT_VARIANT (t))

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7bb464f8aa783f5423ead89aafe6884dc4f2305c..9c1c49bda28da6e0b91c9ab048be5166539ab8a9 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2019-04-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/90108
+       * decl.c (duplicate_decls): If remove is main variant and
+       DECL_ORIGINAL_TYPE is some other type, remove a DECL_ORIGINAL_TYPE
+       variant that has newdecl as TYPE_NAME if any.
+
 2019-04-18  Jason Merrill  <jason@redhat.com>
 
        PR c++/87554 - ICE with extern template and reference member.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 420d6d896ec005214e4de9a63f7faf14a0e5aa79..21b4cc6b83ca9e925f8f778120e6bafb4f960e79 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2133,7 +2133,24 @@ next_arg:;
            {
              tree remove = TREE_TYPE (newdecl);
              if (TYPE_MAIN_VARIANT (remove) == remove)
-               gcc_assert (TYPE_NEXT_VARIANT (remove) == NULL_TREE);
+               {
+                 gcc_assert (TYPE_NEXT_VARIANT (remove) == NULL_TREE);
+                 /* If remove is the main variant, no need to remove that
+                    from the list.  One of the DECL_ORIGINAL_TYPE
+                    variants, e.g. created for aligned attribute, might still
+                    refer to the newdecl TYPE_DECL though, so remove that one
+                    in that case.  */
+                 if (tree orig = DECL_ORIGINAL_TYPE (newdecl))
+                   if (orig != remove)
+                     for (tree t = TYPE_MAIN_VARIANT (orig); t;
+                          t = TYPE_MAIN_VARIANT (t))
+                       if (TYPE_NAME (TYPE_NEXT_VARIANT (t)) == newdecl)
+                         {
+                           TYPE_NEXT_VARIANT (t)
+                             = TYPE_NEXT_VARIANT (TYPE_NEXT_VARIANT (t));
+                           break;
+                         }
+               }           
              else
                for (tree t = TYPE_MAIN_VARIANT (remove); ;
                     t = TYPE_NEXT_VARIANT (t))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 451f190b19509b43e7e7e1a6cc2f4b6ce17d5b00..15e1d14038c7c125848aa96115018bb4fda43eb3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-04-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/90108
+       * c-c++-common/pr90108.c: New test.
+
 2019-04-18  Richard Sandiford  <richard.sandiford@arm.com>
 
        PR middle-end/85164

diff --git a/gcc/testsuite/c-c++-common/pr90108.c b/gcc/testsuite/c-c++-common/pr90108.c
new file mode 100644 (file)
index 0000000..fa5b846
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/pr90108.c
@@ -0,0 +1,6 @@
+/* PR c++/90108 */
+/* { dg-do compile } */
+/* { dg-options "--param ggc-min-heapsize=0" } */
+
+typedef unsigned int a __attribute__ ((__aligned__(8), __may_alias__));
+typedef unsigned int a __attribute__ ((__aligned__(8), __may_alias__));