diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e04f07bfbf1..066a6bf19a5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-19  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+	* tree.h (TYPE_ARRAY_MAX_SIZE): Use type.maxval directly.
+
 2004-03-19  Denis Chertykov  <denisc@overta.ru>
 
 	* config/avr/avr.md ("call_insn"): Handle explicit integer
diff --git a/gcc/tree.h b/gcc/tree.h
index e5e710d63a4..7a961e50d79 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1142,7 +1142,7 @@ struct tree_block GTY(())
    object of the given ARRAY_TYPE.  This allows temporaries to be
    allocated.  */
 #define TYPE_ARRAY_MAX_SIZE(ARRAY_TYPE) \
-  TYPE_MAX_VALUE (ARRAY_TYPE_CHECK (ARRAY_TYPE))
+  (ARRAY_TYPE_CHECK (ARRAY_TYPE)->type.maxval)
 
 /* For a VECTOR_TYPE, this is the number of sub-parts of the vector.  */
 #define TYPE_VECTOR_SUBPARTS(VECTOR_TYPE) \