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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9760ccfca040ecdfa56be47339d327d1f955cb64..cc70e9e50047b89d93ad90d2bfe43e8e2cfe7b0d 100644 (file)
--- 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 912676393d0d43abc382745c863b114e24a6a52e..fb3e8fc956cd4c37a49b988355eb872718cf823b 100644 (file)
--- 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 55464c0c396f42b45de9abbdb099de425a0704fa..6e14ee51bd9c5e91815436528e02058545e4655b 100644 (file)
--- 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 (file)
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]);
+}