re PR c++/27384 (ICE with invalid array size)

	PR middle-end/27384
	* fold-const.c (size_binop): Move sanity check for arguments to
	the beginning of the function.

	* g++.dg/other/fold1.C: New test.

From-SVN: r113703

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be18f843ad61d8578fe467e2c276535a2c6baf91..be9553d839b6546edb820f2a21ed347c796173d2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-11  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+       PR middle-end/27384
+       * fold-const.c (size_binop): Move sanity check for arguments to
+       the beginning of the function.
+
 2006-05-09  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/27136

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index d5575b48223a82ccd33d2aad1d043894a064f286..3b4404e461badd9a88a5d79825d29403020f4ada 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -1633,6 +1633,9 @@ size_binop (enum tree_code code, tree arg0, tree arg1)
 {
   tree type = TREE_TYPE (arg0);
 
+  if (arg0 == error_mark_node || arg1 == error_mark_node)
+    return error_mark_node;
+
   gcc_assert (TREE_CODE (type) == INTEGER_TYPE && TYPE_IS_SIZETYPE (type)
              && type == TREE_TYPE (arg1));
 
@@ -1652,9 +1655,6 @@ size_binop (enum tree_code code, tree arg0, tree arg1)
       return int_const_binop (code, arg0, arg1, 0);
     }
 
-  if (arg0 == error_mark_node || arg1 == error_mark_node)
-    return error_mark_node;
-
   return fold (build2 (code, type, arg0, arg1));
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a15879b6a17d55c57edf1f39584d09d9f02d8f73..26a7890336668b1dae05637b6ebe3fa10f8a80ff 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-11  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
+       PR middle-end/27384
+       * g++.dg/other/fold1.C: New test.
+
        PR c++/27547
        * g++.dg/other/operator1.C: New test.
 

diff --git a/gcc/testsuite/g++.dg/other/fold1.C b/gcc/testsuite/g++.dg/other/fold1.C
new file mode 100644 (file)
index 0000000..f1f0dd9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/fold1.C
@@ -0,0 +1,8 @@
+// PR middle-end/27384
+// { dg-do compile }
+
+struct A
+{
+    static const int i = i;  // { dg-error "not declared" }
+    int x[i];                // { dg-error "variable-size array" }
+};