Hi!
On 2013-01-24T10:14:58-0500, Diego Novillo <dnovi...@google.com> wrote:
> [...] the patch [...] committed [...]
This did clean up some things:
> --- a/gcc/ggc-internal.h
> +++ b/gcc/ggc-internal.h
> @@ -55,8 +55,7 @@ extern struct ggc_pch_data *init_ggc_pch (void);
> 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,
> - enum gt_types_enum);
> +extern void ggc_pch_count_object (struct ggc_pch_data *, void *, size_t,
> bool);
>
> /* Return the total size of the data to be written to hold all
> the objects previously passed to ggc_pch_count_object. */
> @@ -69,8 +68,7 @@ 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,
> - enum gt_types_enum);
> +extern char *ggc_pch_alloc_object (struct ggc_pch_data *, void *, size_t,
> bool);
> --- a/gcc/ggc-page.c
> +++ b/gcc/ggc-page.c
> @@ -2230,8 +2221,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,
> - enum gt_types_enum type ATTRIBUTE_UNUSED)
> + size_t size, bool is_string ATTRIBUTE_UNUSED)
> {
> unsigned order;
>
> @@ -2274,8 +2264,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,
> - enum gt_types_enum type ATTRIBUTE_UNUSED)
> + size_t size, bool is_string ATTRIBUTE_UNUSED)
> {
> unsigned order;
> char *result;
..., but left in other 'ATTRIBUTE_UNUSED's.
To enable another thing I'm working on, OK to push the attached clean-up
"GGC: Remove unused 'bool is_string' arguments to
'ggc_pch_{count,alloc,write}_object'"?
Grüße
Thomas
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634
München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas
Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht
München, HRB 106955
>From 1267d24dde89b2e8dfb8e5f3b6e2928052b344c5 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tho...@codesourcery.com>
Date: Sat, 1 Jul 2023 00:25:05 +0200
Subject: [PATCH] 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.
---
gcc/ggc-common.cc | 9 +++------
gcc/ggc-internal.h | 15 ++++++---------
gcc/ggc-page.cc | 6 +++---
3 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/gcc/ggc-common.cc b/gcc/ggc-common.cc
index db317f49993..173ab64cb73 100644
--- 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 25e6ce66ebc..33874bcec99 100644
--- 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 c25218d7415..62b1b5cbc11 100644
--- 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 };
--
2.34.1
