From d875078437f3e2a604d702281b742b591bfbe7d0 Mon Sep 17 00:00:00 2001
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
Date: Mon, 1 Apr 2002 05:08:51 +0000
Subject: [PATCH] varray.h (VARRAY_CHECK): Const-ify.

	* varray.h (VARRAY_CHECK): Const-ify.
	* ggc.h (ggc_mark_rtx, ggc_mark_tree, ggc_mark_nonnull_tree,
	ggc_mark_rtvec, ggc_mark): Const-ify.

From-SVN: r51677
---
 gcc/ChangeLog |  3 +++
 gcc/ggc.h     | 10 +++++-----
 gcc/varray.h  |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 08711640fc2..c97fd639c9b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -2,6 +2,9 @@
 
 	* rtl.h (RTL_CHECK1, RTL_CHECK2, RTL_CHECKC1, RTL_CHECKC2,
 	RTVEC_ELT): Const-ify.
+	* varray.h (VARRAY_CHECK): Const-ify.
+	* ggc.h (ggc_mark_rtx, ggc_mark_tree, ggc_mark_nonnull_tree,
+	ggc_mark_rtvec, ggc_mark): Const-ify.
 
 2002-04-01  Neil Booth  <neil@daikokuya.demon.co.uk>
 
diff --git a/gcc/ggc.h b/gcc/ggc.h
index 5933084720f..917b65e9a7f 100644
--- a/gcc/ggc.h
+++ b/gcc/ggc.h
@@ -88,35 +88,35 @@ extern void ggc_mark_rtvec_children	PARAMS ((struct rtvec_def *));
 
 #define ggc_mark_rtx(EXPR)                      \
   do {                                          \
-    rtx r__ = (EXPR);                           \
+    rtx const r__ = (EXPR);                     \
     if (ggc_test_and_set_mark (r__))            \
       ggc_mark_rtx_children (r__);              \
   } while (0)
 
 #define ggc_mark_tree(EXPR)				\
   do {							\
-    tree t__ = (EXPR);					\
+    tree const t__ = (EXPR);				\
     if (ggc_test_and_set_mark (t__))			\
       VARRAY_PUSH_TREE (ggc_pending_trees, t__);	\
   } while (0)
 
 #define ggc_mark_nonnull_tree(EXPR)			\
   do {							\
-    tree t__ = (EXPR);					\
+    tree const t__ = (EXPR);				\
     if (! ggc_set_mark (t__))				\
       VARRAY_PUSH_TREE (ggc_pending_trees, t__);	\
   } while (0)
 
 #define ggc_mark_rtvec(EXPR)                    \
   do {                                          \
-    rtvec v__ = (EXPR);                         \
+    rtvec const v__ = (EXPR);                   \
     if (ggc_test_and_set_mark (v__))            \
       ggc_mark_rtvec_children (v__);            \
   } while (0)
 
 #define ggc_mark(EXPR)				\
   do {						\
-    const void *a__ = (EXPR);			\
+    const void *const a__ = (EXPR);		\
     if (a__ != NULL)				\
       ggc_set_mark (a__);			\
   } while (0)
diff --git a/gcc/varray.h b/gcc/varray.h
index 66c4d39a3a6..130553bb4d2 100644
--- a/gcc/varray.h
+++ b/gcc/varray.h
@@ -177,8 +177,8 @@ extern void varray_check_failed PARAMS ((varray_type, size_t,
 					const char *, int,
 					const char *)) ATTRIBUTE_NORETURN;
 #define VARRAY_CHECK(VA, N, T) __extension__			\
-(*({ varray_type _va = VA;					\
-     size_t _n = N; 						\
+(*({ varray_type const _va = (VA);				\
+     const size_t _n = (N); 					\
      if (_n >= _va->num_elements)				\
        varray_check_failed (_va, _n, __FILE__, __LINE__, __FUNCTION__);	\
      &_va->data.T[_n]; }))