GGC: Remove unused 'bool is_string' arguments to 'ggc_pch_{count,alloc,write}_object'

They're unused since the removal of 'gcc/ggc-zone.c' in 2013 Subversion r195426
(Git commit cd030c079e5e42fe3f49261fe01f384e6b7f0111) "Remove zone allocator".

Should any future 'gcc/ggc-[...].cc' ever need this again, it'll be a conscious
decision at that time.

	gcc/
	* ggc-internal.h (ggc_pch_count_object, ggc_pch_alloc_object)
	(ggc_pch_write_object): Remove 'bool is_string' argument.
	* ggc-common.cc: Adjust.
	* ggc-page.cc: Likewise.

diff --git a/gcc/ggc-common.cc b/gcc/ggc-common.cc
index db317f499936e509fdb580c6cddd263da853d398..173ab64cb73a7a2598e13d01ffb322e13ffc6381 100644 (file)
--- a/gcc/ggc-common.cc
+++ b/gcc/ggc-common.cc
@@ -336,8 +336,7 @@ ggc_call_count (ptr_data **slot, traversal_state *state)
 {
   struct ptr_data *d = *slot;
 
-  ggc_pch_count_object (state->d, d->obj, d->size,
-                       d->note_ptr_fn == gt_pch_p_S);
+  ggc_pch_count_object (state->d, d->obj, d->size);
   state->count++;
   return 1;
 }
@@ -347,8 +346,7 @@ ggc_call_alloc (ptr_data **slot, traversal_state *state)
 {
   struct ptr_data *d = *slot;
 
-  d->new_addr = ggc_pch_alloc_object (state->d, d->obj, d->size,
-                                     d->note_ptr_fn == gt_pch_p_S);
+  d->new_addr = ggc_pch_alloc_object (state->d, d->obj, d->size);
   state->ptrs[state->ptrs_i++] = d;
   return 1;
 }
@@ -642,8 +640,7 @@ gt_pch_save (FILE *f)
                                  state.ptrs[i]->note_ptr_cookie,
                                  relocate_ptrs, &state);
       ggc_pch_write_object (state.d, state.f, state.ptrs[i]->obj,
-                           state.ptrs[i]->new_addr, state.ptrs[i]->size,
-                           state.ptrs[i]->note_ptr_fn == gt_pch_p_S);
+                           state.ptrs[i]->new_addr, state.ptrs[i]->size);
       if (state.ptrs[i]->note_ptr_fn != gt_pch_p_S)
        memcpy (state.ptrs[i]->obj, this_object, state.ptrs[i]->size);
 #if defined ENABLE_VALGRIND_ANNOTATIONS && defined VALGRIND_GET_VBITS

diff --git a/gcc/ggc-internal.h b/gcc/ggc-internal.h
index 25e6ce66ebcff3d58db8c8ed41825ff7bf4766a7..33874bcec99816a8dabfdd4df5a2b1c6f55ea712 100644 (file)
--- a/gcc/ggc-internal.h
+++ b/gcc/ggc-internal.h
@@ -52,9 +52,8 @@ extern struct ggc_pch_data *init_ggc_pch (void);
 
 /* The second parameter and third parameters give the address and size
    of an object.  Update the ggc_pch_data structure with as much of
-   that information as is necessary. The bool argument should be true
-   if the object is a string.  */
-extern void ggc_pch_count_object (struct ggc_pch_data *, void *, size_t, bool);
+   that information as is necessary.  */
+extern void ggc_pch_count_object (struct ggc_pch_data *, void *, size_t);
 
 /* Return the total size of the data to be written to hold all
    the objects previously passed to ggc_pch_count_object.  */
@@ -65,17 +64,15 @@ extern size_t ggc_pch_total_size (struct ggc_pch_data *);
 extern void ggc_pch_this_base (struct ggc_pch_data *, void *);
 
 /* Assuming that the objects really do end up at the address
-   passed to ggc_pch_this_base, return the address of this object.
-   The bool argument should be true if the object is a string.  */
-extern char *ggc_pch_alloc_object (struct ggc_pch_data *, void *, size_t, bool);
+   passed to ggc_pch_this_base, return the address of this object.  */
+extern char *ggc_pch_alloc_object (struct ggc_pch_data *, void *, size_t);
 
 /* Write out any initial information required.  */
 extern void ggc_pch_prepare_write (struct ggc_pch_data *, FILE *);
 
-/* Write out this object, including any padding.  The last argument should be
-   true if the object is a string.  */
+/* Write out this object, including any padding.  */
 extern void ggc_pch_write_object (struct ggc_pch_data *, FILE *, void *,
-                                 void *, size_t, bool);
+                                 void *, size_t);
 
 /* All objects have been written, write out any final information
    required.  */

diff --git a/gcc/ggc-page.cc b/gcc/ggc-page.cc
index 2f0b72e1b22cfbd228d7a95b37f2adfade40c262..b74572cae4f9839047bac57398cb5ae0fc62d74b 100644 (file)
--- a/gcc/ggc-page.cc
+++ b/gcc/ggc-page.cc
@@ -2409,7 +2409,7 @@ init_ggc_pch (void)
 
 void
 ggc_pch_count_object (struct ggc_pch_data *d, void *x ATTRIBUTE_UNUSED,
-                     size_t size, bool is_string ATTRIBUTE_UNUSED)
+                     size_t size)
 {
   unsigned order;
 
@@ -2452,7 +2452,7 @@ ggc_pch_this_base (struct ggc_pch_data *d, void *base)
 
 char *
 ggc_pch_alloc_object (struct ggc_pch_data *d, void *x ATTRIBUTE_UNUSED,
-                     size_t size, bool is_string ATTRIBUTE_UNUSED)
+                     size_t size)
 {
   unsigned order;
   char *result;
@@ -2481,7 +2481,7 @@ ggc_pch_prepare_write (struct ggc_pch_data *d ATTRIBUTE_UNUSED,
 void
 ggc_pch_write_object (struct ggc_pch_data *d,
                      FILE *f, void *x, void *newx ATTRIBUTE_UNUSED,
-                     size_t size, bool is_string ATTRIBUTE_UNUSED)
+                     size_t size)
 {
   unsigned order;
   static const char emptyBytes[256] = { 0 };