diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2018-02-26 15:00:44 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2018-02-26 15:00:44 +0000 |
| commit | 98c26210e2a36a4b379e4a711d34dda92f076acf (patch) | |
| tree | 4d857ed72fe7ec3595c20f82f6804fbd151b82de /gcc | |
| parent | 856c79ea8d01c8094a6db7cb80de53303bed3e08 (diff) | |
| download | gcc-98c26210e2a36a4b379e4a711d34dda92f076acf.zip gcc-98c26210e2a36a4b379e4a711d34dda92f076acf.tar.gz gcc-98c26210e2a36a4b379e4a711d34dda92f076acf.tar.bz2 | |
re PR c++/84533 (ICE with duplicate enum value)
/cp
2018-02-26 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84533
* decl.c (redeclaration_error_message): Don't try to use
DECL_DECLARED_CONSTEXPR_P on CONST_DECLs.
/testsuite
2018-02-26 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84533
* g++.dg/cpp1z/pr84533.C: New.
From-SVN: r257991
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/pr84533.C | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 217bc72..97559ed 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2018-02-26 Paolo Carlini <paolo.carlini@oracle.com> + PR c++/84533 + * decl.c (redeclaration_error_message): Don't try to use + DECL_DECLARED_CONSTEXPR_P on CONST_DECLs. + +2018-02-26 Paolo Carlini <paolo.carlini@oracle.com> + * lambda.c (build_capture_proxy): Define static. * cp-tree.h (build_capture_proxy): Remove. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index f91f311..cf91773 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2919,6 +2919,7 @@ redeclaration_error_message (tree newdecl, tree olddecl) specifier is declaration rather than definition (and deprecated). */ if (cxx_dialect >= cxx17 + && VAR_P (olddecl) && DECL_CLASS_SCOPE_P (olddecl) && DECL_DECLARED_CONSTEXPR_P (olddecl) && !DECL_INITIAL (newdecl)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8c16b19..d53ab4d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-26 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/84533 + * g++.dg/cpp1z/pr84533.C: New. + 2018-02-26 Marek Polacek <polacek@redhat.com> PR c++/84537 diff --git a/gcc/testsuite/g++.dg/cpp1z/pr84533.C b/gcc/testsuite/g++.dg/cpp1z/pr84533.C new file mode 100644 index 0000000..0a71fe1 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/pr84533.C @@ -0,0 +1,3 @@ +// { dg-options "-std=c++17" } + +enum E { e, e }; // { dg-error "redefinition" } |