diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 7 | ||||
| -rw-r--r-- | gcc/cp/init.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/int128-5.C | 10 |
5 files changed, 30 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4f4691a..a7acfa7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2017-03-10 Jakub Jelinek <jakub@redhat.com> + + PR c++/79896 + * decl.c (finish_enum_value_list): If value is error_mark_node, + don't copy it and change its type. + * init.c (constant_value_1): Return error_mark_node if DECL_INITIAL + of CONST_DECL is error_mark_node. + 2017-03-09 Marek Polacek <polacek@redhat.com> PR c++/79900 - ICE in strip_typedefs diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 3e7316f..2a97ffc 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -14323,9 +14323,12 @@ finish_enum_value_list (tree enumtype) input_location = saved_location; /* Do not clobber shared ints. */ - value = copy_node (value); + if (value != error_mark_node) + { + value = copy_node (value); - TREE_TYPE (value) = enumtype; + TREE_TYPE (value) = enumtype; + } DECL_INITIAL (decl) = value; } diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 18043e8..8bfcbde 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -2162,7 +2162,8 @@ constant_value_1 (tree decl, bool strict_p, bool return_aggregate_cst_ok_p) init = DECL_INITIAL (decl); if (init == error_mark_node) { - if (DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (decl)) + if (TREE_CODE (decl) == CONST_DECL + || DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (decl)) /* Treat the error as a constant to avoid cascading errors on excessively recursive template instantiation (c++/9335). */ return init; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index efee7c1..8b89d82 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-03-10 Jakub Jelinek <jakub@redhat.com> + + PR c++/79896 + * g++.dg/ext/int128-5.C: New test. + 2017-03-10 Segher Boessenkool <segher@kernel.crashing.org> PR testsuite/79356 diff --git a/gcc/testsuite/g++.dg/ext/int128-5.C b/gcc/testsuite/g++.dg/ext/int128-5.C new file mode 100644 index 0000000..c2d9297 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/int128-5.C @@ -0,0 +1,10 @@ +// PR c++/79896 +// { dg-do compile { target { ilp32 && { ! int128 } } } } +// { dg-options "" } + +enum E +{ + e1 = 0xffffffffffffffffULL, + e2, // { dg-error "overflow in enumeration values" } + e3 +} e = e3; |