aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-09-10 00:08:46 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2008-09-10 00:08:46 +0200
commit701e903a76b3e1401b2a01c28504b21bf6a578fa (patch)
treed198409c341089c5a9ceb5354c3015ff947c8de1
parentc2a4718a14c4627dd6ddc2364b8e91e9975bacee (diff)
downloadgcc-701e903a76b3e1401b2a01c28504b21bf6a578fa.zip
gcc-701e903a76b3e1401b2a01c28504b21bf6a578fa.tar.gz
gcc-701e903a76b3e1401b2a01c28504b21bf6a578fa.tar.bz2
re PR c++/37417 (error: type mismatch in binary expression, verify_gimple failed)
PR c++/37417 * tree.c (array_type_nelts_top): Add size_one_node instead of integer_one_node. * g++.dg/ext/vla5.C: New test. From-SVN: r140178
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/tree.c2
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/ext/vla5.C10
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9760ccf..cc70e9e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-09 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/37417
+ * tree.c (array_type_nelts_top): Add size_one_node instead of
+ integer_one_node.
+
2008-09-09 Jason Merrill <jason@redhat.com>
PR c++/37439
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 9126763..fb3e8fc 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1461,7 +1461,7 @@ array_type_nelts_top (tree type)
{
return fold_build2 (PLUS_EXPR, sizetype,
array_type_nelts (type),
- integer_one_node);
+ size_one_node);
}
/* Return, as an INTEGER_CST node, the number of elements for TYPE
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 55464c0..6e14ee5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2008-09-09 Jakub Jelinek <jakub@redhat.com>
+ PR c++/37417
+ * g++.dg/ext/vla5.C: New test.
+
PR middle-end/37356
* g++.dg/tree-ssa/pr37356.C: New test.
diff --git a/gcc/testsuite/g++.dg/ext/vla5.C b/gcc/testsuite/g++.dg/ext/vla5.C
new file mode 100644
index 0000000..021d484
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/vla5.C
@@ -0,0 +1,10 @@
+// PR c++/37417
+// Testcase by Martin Michlmayr <tbm@cyrius.com>
+// { dg-do compile }
+// { dg-options "-O" }
+
+void
+test (int a)
+{
+ new (char[a]);
+}