From c12b3bd34db27979bc1ce2015f09c959cb9a5fb2 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 7 Mar 2014 18:33:38 +0000 Subject: [PATCH] re PR c++/58609 ([c++11] ICE with uninitialized variable in constexpr) /cp 2014-03-07 Paolo Carlini PR c++/58609 * decl.c (check_initializer): Return NULL_TREE after error; consistently use inform. /testsuite 2014-03-07 Paolo Carlini PR c++/58609 * g++.dg/cpp0x/constexpr-ice12.C: New. From-SVN: r208410 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 4 +++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/constexpr-ice12.C | 9 +++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-ice12.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3c288c09efa5..fd0b4d2e240e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-03-07 Paolo Carlini + + PR c++/58609 + * decl.c (check_initializer): Return NULL_TREE after error; + consistently use inform. + 2014-03-07 Paolo Carlini * decl.c (check_initializer): Remove dead code. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index cd2cc9cfdd70..389ed1a9890d 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5809,9 +5809,11 @@ check_initializer (tree decl, tree init, int flags, vec **cleanups) "member %qD", decl); if (!explained) { - error ("(an out of class initialization is required)"); + inform (input_location, + "(an out of class initialization is required)"); explained = 1; } + return NULL_TREE; } return init_code; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 642abab5f2a4..f516a7554d12 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-03-07 Paolo Carlini + + PR c++/58609 + * g++.dg/cpp0x/constexpr-ice12.C: New. + 2014-03-07 Thomas Schwinge * c-c++-common/gomp/map-1.c: Extend. diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice12.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice12.C new file mode 100644 index 000000000000..98f53b14c104 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice12.C @@ -0,0 +1,9 @@ +// PR c++/58609 +// { dg-do compile { target c++11 } } + +struct A +{ + static constexpr int&& i = 0; // { dg-error "initialization" } +}; + +int j = A::i; -- 2.47.2