aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2012-01-13 00:05:46 -0500
committerJason Merrill <jason@gcc.gnu.org>2012-01-13 00:05:46 -0500
commitf83fa0bf8f411697ec908cfa86ee6faf4cd9c476 (patch)
tree32198337b2009b411e0ebcb9d172c0ef9a2e6bd6 /gcc
parent6fd52f69db07ee478ffdc1ac83a48edd315c33d1 (diff)
downloadgcc-f83fa0bf8f411697ec908cfa86ee6faf4cd9c476.zip
gcc-f83fa0bf8f411697ec908cfa86ee6faf4cd9c476.tar.gz
gcc-f83fa0bf8f411697ec908cfa86ee6faf4cd9c476.tar.bz2
re PR c++/51714 (internal compiler error: Segmentation fault with -std=c++11)
PR c++/51714 * pt.c (value_dependent_expression_p): Treat STMT_EXPR as value-dependent. From-SVN: r183149
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/pt.c5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/ext/stmtexpr14.C12
4 files changed, 28 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 63d8f2f..978df51 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-12 Jason Merrill <jason@redhat.com>
+
+ PR c++/51714
+ * pt.c (value_dependent_expression_p): Treat STMT_EXPR as
+ value-dependent.
+
2012-01-13 Dodji Seketeli <dodji@redhat.com>
PR c++/51633
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 97a9294..f2b4c8e 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -19526,6 +19526,11 @@ value_dependent_expression_p (tree expression)
return false;
}
+ case STMT_EXPR:
+ /* Treat a GNU statement expression as dependent to avoid crashing
+ under fold_non_dependent_expr; it can't be constant. */
+ return true;
+
default:
/* A constant expression is value-dependent if any subexpression is
value-dependent. */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a4b09ea..fe1d559 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-12 Jason Merrill <jason@redhat.com>
+
+ PR c++/51714
+ * g++.dg/ext/stmtexpr14.C: New.
+
2012-01-13 Dodji Seketeli <dodji@redhat.com>
PR c++/51633
diff --git a/gcc/testsuite/g++.dg/ext/stmtexpr14.C b/gcc/testsuite/g++.dg/ext/stmtexpr14.C
new file mode 100644
index 0000000..5f3ff0d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/stmtexpr14.C
@@ -0,0 +1,12 @@
+// PR c++/51714
+
+template <typename T>
+void Foo()
+{
+ true || !__extension__ ({ int verbose = 2; verbose <= 3; });
+}
+
+int main()
+{
+ Foo<int>();
+}