Bail out rather than crashing in array_type_nelts if TYPE_MAX_VALUE is null.

From-SVN: r172227

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0ed308626dd7c81e43864e54889e14fdc2222f0a..c9976bd9f6f7acefd873a4dd3bc8374b1ce3af0f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-09  Duncan Sands  <baldrick@free.fr>
+
+       * tree.c (array_type_nelts): Bail out if TYPE_MAX_VALUE not set.
+
 2011-04-08  Eric Botcazou  <ebotcazou@adacore.com>
 
        * combine.c (combine_validate_cost): Adjust comments.  Set registered

diff --git a/gcc/tree.c b/gcc/tree.c
index ee47982baf0be0e8de221d7260317b69bb1cb153..cf6fa5068a7f32b3d1ccb76b256d4d0c8cb1fad9 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -2462,6 +2462,10 @@ array_type_nelts (const_tree type)
   min = TYPE_MIN_VALUE (index_type);
   max = TYPE_MAX_VALUE (index_type);
 
+  /* TYPE_MAX_VALUE may not be set if the array has unknown length.  */
+  if (!max)
+    return error_mark_node;
+
   return (integer_zerop (min)
          ? max
          : fold_build2 (MINUS_EXPR, TREE_TYPE (max), max, min));