diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-11-22 23:35:52 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-11-22 23:35:52 +0100 |
| commit | 6c19e703de27d0fd94bdf3e3941a4f5b7b72f4e4 (patch) | |
| tree | f1d1ba8a4fceb120ca9dc9ae7121b2a78948ec46 /gcc | |
| parent | 52af380439eab2770ad65af495e2c1a281e4b097 (diff) | |
| download | gcc-6c19e703de27d0fd94bdf3e3941a4f5b7b72f4e4.zip gcc-6c19e703de27d0fd94bdf3e3941a4f5b7b72f4e4.tar.gz gcc-6c19e703de27d0fd94bdf3e3941a4f5b7b72f4e4.tar.bz2 | |
re PR c++/82401 (error: qsort comparator non-negative on sorted output: 1 in insert_late_enum_def_bindings on an invalid code)
PR c++/82401
* name-lookup.c (member_name_cmp): Return 0 if a == b.
* g++.dg/cpp0x/pr82401.C: New test.
From-SVN: r255084
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr82401.C | 16 |
4 files changed, 30 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f97187e..59e890f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2017-11-22 Jakub Jelinek <jakub@redhat.com> + + PR c++/82401 + * name-lookup.c (member_name_cmp): Return 0 if a == b. + 2017-11-22 David Malcolm <dmalcolm@redhat.com> PR c++/62170 diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 7c363b0..9f65c4d 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -1469,7 +1469,10 @@ member_name_cmp (const void *a_p, const void *b_p) how we order these. Use UID as a proxy for source ordering, so that identically-located decls still have a well-defined stable ordering. */ - return DECL_UID (a) < DECL_UID (b) ? -1 : +1; + if (DECL_UID (a) != DECL_UID (b)) + return DECL_UID (a) < DECL_UID (b) ? -1 : +1; + gcc_assert (a == b); + return 0; } static struct { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 36867c5..726773b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-11-22 Jakub Jelinek <jakub@redhat.com> + + PR c++/82401 + * g++.dg/cpp0x/pr82401.C: New test. + 2017-11-22 David Malcolm <dmalcolm@redhat.com> PR tree-optimization/82588 diff --git a/gcc/testsuite/g++.dg/cpp0x/pr82401.C b/gcc/testsuite/g++.dg/cpp0x/pr82401.C new file mode 100644 index 0000000..52d40e0 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr82401.C @@ -0,0 +1,16 @@ +// PR c++/82401 +// { dg-do compile { target c++11 } } +// { dg-options "" } + +template <typename T> struct A +{ + enum E : T; + void h (); +}; +template <typename T> enum A<T>::E : T { e1, e2 }; +template <> enum A<long long>::E : long long {}; +template <typename T> struct C +{ + enum class E : T; +}; +C<int>::E c3 = C<int>::E::e1; // { dg-error "is not a member of" } |