[Bug c/89933] [7 Regression] ICE in merge_decls, at c/c-decl.c:2517

[jakub at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89933

--- Comment #8 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
Author: jakub
Date: Fri Aug 30 12:36:05 2019
New Revision: 275147

URL: https://gcc.gnu.org/viewcvs?rev=275147&root=gcc&view=rev
Log:
        Backported from mainline
        2019-04-12  Jakub Jelinek  <jakub@redhat.com>

        PR c/89933
        * c-decl.c (merge_decls): When newdecl's type is its main variant,
        don't try to remove it from the variant list, but instead assert
        it has no variants.

        * decl.c (duplicate_decls): When newdecl's type is its main variant,
        don't try to remove it from the variant list, but instead assert
        it has no variants.

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

Added:
    branches/gcc-7-branch/gcc/testsuite/c-c++-common/pr89933.c
Modified:
    branches/gcc-7-branch/gcc/c/ChangeLog
    branches/gcc-7-branch/gcc/c/c-decl.c
    branches/gcc-7-branch/gcc/cp/ChangeLog
    branches/gcc-7-branch/gcc/cp/decl.c
    branches/gcc-7-branch/gcc/testsuite/ChangeLog