aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2014-03-07 18:33:38 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2014-03-07 18:33:38 +0000
commitc12b3bd34db27979bc1ce2015f09c959cb9a5fb2 (patch)
tree1baf263823511029bdd6a6477a048cec7fb646e7
parentdf5bc1cb61b77466c4c0e4df83367177f264a8e1 (diff)
downloadgcc-c12b3bd34db27979bc1ce2015f09c959cb9a5fb2.zip
gcc-c12b3bd34db27979bc1ce2015f09c959cb9a5fb2.tar.gz
gcc-c12b3bd34db27979bc1ce2015f09c959cb9a5fb2.tar.bz2
re PR c++/58609 ([c++11] ICE with uninitialized variable in constexpr)
/cp 2014-03-07 Paolo Carlini <paolo.carlini@oracle.com> PR c++/58609 * decl.c (check_initializer): Return NULL_TREE after error; consistently use inform. /testsuite 2014-03-07 Paolo Carlini <paolo.carlini@oracle.com> PR c++/58609 * g++.dg/cpp0x/constexpr-ice12.C: New. From-SVN: r208410
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/decl.c4
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/constexpr-ice12.C9
4 files changed, 23 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3c288c0..fd0b4d2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,11 @@
2014-03-07 Paolo Carlini <paolo.carlini@oracle.com>
+ PR c++/58609
+ * decl.c (check_initializer): Return NULL_TREE after error;
+ consistently use inform.
+
+2014-03-07 Paolo Carlini <paolo.carlini@oracle.com>
+
* decl.c (check_initializer): Remove dead code.
2014-03-06 Marek Polacek <polacek@redhat.com>
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index cd2cc9c..389ed1a 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5809,9 +5809,11 @@ check_initializer (tree decl, tree init, int flags, vec<tree, va_gc> **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 642abab..f516a75 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-07 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/58609
+ * g++.dg/cpp0x/constexpr-ice12.C: New.
+
2014-03-07 Thomas Schwinge <thomas@codesourcery.com>
* 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 0000000..98f53b1
--- /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;