diff options
| author | Marek Polacek <polacek@redhat.com> | 2018-03-14 06:14:57 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2018-03-14 06:14:57 +0000 |
| commit | 8fef0dc6a9479bdd4f82e52f7b7e1e678a817b75 (patch) | |
| tree | b14a172ec9120de87c25ad46deffdebac67a1b4e /gcc | |
| parent | 024a6f45a72d4686aa535a37abe7b34d678e459d (diff) | |
| download | gcc-8fef0dc6a9479bdd4f82e52f7b7e1e678a817b75.zip gcc-8fef0dc6a9479bdd4f82e52f7b7e1e678a817b75.tar.gz gcc-8fef0dc6a9479bdd4f82e52f7b7e1e678a817b75.tar.bz2 | |
re PR c++/84596 (internal compiler error: unexpected expression '(bool)c' of kind implicit_conv_expr (cxx_eval_constant_expression))
PR c++/84596
* semantics.c (finish_static_assert): Check
instantiation_dependent_expression_p instead of
{type,value}_dependent_expression_p.
* g++.dg/cpp0x/static_assert15.C: New test.
From-SVN: r258513
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/static_assert15.C | 10 |
4 files changed, 23 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 71fba75..067d538 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2018-03-14 Marek Polacek <polacek@redhat.com> + + PR c++/84596 + * semantics.c (finish_static_assert): Check + instantiation_dependent_expression_p instead of + {type,value}_dependent_expression_p. + 2018-03-13 Paolo Carlini <paolo.carlini@oracle.com> Jason Merrill <jason@redhat.com> diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index bb8b5953..fdf37be 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -8630,8 +8630,7 @@ finish_static_assert (tree condition, tree message, location_t location, if (check_for_bare_parameter_packs (condition)) condition = error_mark_node; - if (type_dependent_expression_p (condition) - || value_dependent_expression_p (condition)) + if (instantiation_dependent_expression_p (condition)) { /* We're in a template; build a STATIC_ASSERT and put it in the right place. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bc31ea6..a4bf53c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-03-14 Marek Polacek <polacek@redhat.com> + + PR c++/84596 + * g++.dg/cpp0x/static_assert15.C: New test. + 2018-03-13 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/61775 diff --git a/gcc/testsuite/g++.dg/cpp0x/static_assert15.C b/gcc/testsuite/g++.dg/cpp0x/static_assert15.C new file mode 100644 index 0000000..a740f73 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/static_assert15.C @@ -0,0 +1,10 @@ +// PR c++/84596 +// { dg-do compile { target c++11 } } + +template<int x> +struct a { + constexpr void b() { + int c; + static_assert(c %= 1, ""); + } +}; |