diff options
| author | Marek Polacek <polacek@redhat.com> | 2016-01-08 19:08:37 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2016-01-08 19:08:37 +0000 |
| commit | bd8f5bb2978922bf0cf51eef3486f4da83df556d (patch) | |
| tree | 5f1d4a6ca84d613ad19ed6405d181552acd655e7 | |
| parent | bb0f5ca786de6649e1350b281d289ed4ad871b9e (diff) | |
| download | gcc-bd8f5bb2978922bf0cf51eef3486f4da83df556d.zip gcc-bd8f5bb2978922bf0cf51eef3486f4da83df556d.tar.gz gcc-bd8f5bb2978922bf0cf51eef3486f4da83df556d.tar.bz2 | |
re PR c++/68449 (ICE in cxx_eval_constant_expression on atomic_load in C++)
PR c++/68449
* constexpr.c (cxx_eval_constant_expression): Handle NULL initializer.
* g++.dg/pr68449.C: New.
From-SVN: r232176
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/pr68449.C | 9 |
4 files changed, 21 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6b0eae6..49dc0cf 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2016-01-08 Marek Polacek <polacek@redhat.com> + + PR c++/68449 + * constexpr.c (cxx_eval_constant_expression): Handle NULL initializer. + 2016-01-08 Jason Merrill <jason@redhat.com> * constexpr.c (cxx_eval_call_expression): Remove convert_to_void diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index c6c3467..7b60271 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -3184,7 +3184,8 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, r = TARGET_EXPR_INITIAL (r); if (VAR_P (r)) if (tree *p = ctx->values->get (r)) - r = *p; + if (*p != NULL_TREE) + r = *p; if (DECL_P (r)) { if (!ctx->quiet) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 235eab7..c7162e2b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-01-08 Marek Polacek <polacek@redhat.com> + + PR c++/68449 + * g++.dg/pr68449.C: New. + 2016-01-08 Alan Lawrence <alan.lawrence@arm.com> PR tree-optimization/68707 diff --git a/gcc/testsuite/g++.dg/pr68449.C b/gcc/testsuite/g++.dg/pr68449.C new file mode 100644 index 0000000..7d86fe9 --- /dev/null +++ b/gcc/testsuite/g++.dg/pr68449.C @@ -0,0 +1,9 @@ +// PR c++/68449 +// { dg-do compile } +// { dg-options "-Wsign-compare" } + +int +foo (int a) +{ + return __extension__ ({ int b; b; }) < 0; +} |