diff mbox series

[v2] GTY: Clean up obsolete parametrized structs remnants (was: [PATCH 3/3] remove gengtype support for param_is use_param, if_marked and splay tree allocators)

Message ID 87h6qitk0h.fsf@euler.schwinge.homeip.net
State Unresolved
Headers
Series [v2] GTY: Clean up obsolete parametrized structs remnants (was: [PATCH 3/3] remove gengtype support for param_is use_param, if_marked and splay tree allocators) |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Thomas Schwinge July 5, 2023, 4:12 p.m. UTC 
  Hi!

On 2023-07-05T10:16:09+0200, I wrote:
> On 2014-11-23T23:11:36-0500, tsaunders@mozilla.com wrote:
>> gcc/
>>
>>       * plugin.c, plugin.def, ggc.h, ggc-common.c, gengtype.h, gengtype.c,
>>       gengtype-state.c, gengtype-parse.c, gentype-lex.l, gcc-plugin.h,
>>       doc/plugins.texi, doc/gty.texi: Remove support for if_marked and
>>       param_is.
>
>> --- a/gcc/gengtype.h
>> +++ b/gcc/gengtype.h
>
>> @@ -153,11 +152,6 @@ enum typekind {
>>    TYPE_LANG_STRUCT,     /* GCC front-end language specific structs.
>>                             Various languages may have homonymous but
>>                             different structs.  */
>> -  TYPE_PARAM_STRUCT,    /* Type for parametrized structs, e.g. hash_t
>> -                           hash-tables, ...  See (param_is, use_param,
>> -                           param1_is, param2_is,... use_param1,
>> -                           use_param_2,... use_params) GTY
>> -                           options.  */
>>    TYPE_USER_STRUCT   /* User defined type.  Walkers and markers for
>>                          this type are assumed to be provided by the
>>                          user.  */
>
> OK to push the attached
> "GTY: Clean up obsolete parametrized structs remnants"?

Updated per
<https://inbox.sourceware.org/87jzveu08y.fsf@euler.schwinge.homeip.net>
"GTY: Repair 'enum gty_token', 'token_names' desynchronization", OK to
push the attached
v2 "GTY: Clean up obsolete parametrized structs remnants"?


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

Comments

Richard Biener July 6, 2023, 6:03 a.m. UTC | #1 
On Wed, Jul 5, 2023 at 6:13 PM Thomas Schwinge <thomas@codesourcery.com> wrote:
>
> Hi!
>
> On 2023-07-05T10:16:09+0200, I wrote:
> > On 2014-11-23T23:11:36-0500, tsaunders@mozilla.com wrote:
> >> gcc/
> >>
> >>       * plugin.c, plugin.def, ggc.h, ggc-common.c, gengtype.h, gengtype.c,
> >>       gengtype-state.c, gengtype-parse.c, gentype-lex.l, gcc-plugin.h,
> >>       doc/plugins.texi, doc/gty.texi: Remove support for if_marked and
> >>       param_is.
> >
> >> --- a/gcc/gengtype.h
> >> +++ b/gcc/gengtype.h
> >
> >> @@ -153,11 +152,6 @@ enum typekind {
> >>    TYPE_LANG_STRUCT,     /* GCC front-end language specific structs.
> >>                             Various languages may have homonymous but
> >>                             different structs.  */
> >> -  TYPE_PARAM_STRUCT,    /* Type for parametrized structs, e.g. hash_t
> >> -                           hash-tables, ...  See (param_is, use_param,
> >> -                           param1_is, param2_is,... use_param1,
> >> -                           use_param_2,... use_params) GTY
> >> -                           options.  */
> >>    TYPE_USER_STRUCT   /* User defined type.  Walkers and markers for
> >>                          this type are assumed to be provided by the
> >>                          user.  */
> >
> > OK to push the attached
> > "GTY: Clean up obsolete parametrized structs remnants"?
>
> Updated per
> <https://inbox.sourceware.org/87jzveu08y.fsf@euler.schwinge.homeip.net>
> "GTY: Repair 'enum gty_token', 'token_names' desynchronization", OK to
> push the attached
> v2 "GTY: Clean up obsolete parametrized structs remnants"?

OK.

>
> 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
diff mbox series

Patch

From fed7429b8c19c4bed570d343169ba6a35ed088b0 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Tue, 4 Jul 2023 22:47:48 +0200
Subject: [PATCH] GTY: Clean up obsolete parametrized structs remnants

Support removed in 2014 with
commit 63f5d5b818319129217e41bcb23db53f99ff11b0 (Subversion r218558)
"remove gengtype support for param_is use_param, if_marked and splay tree allocators".

	gcc/
	* gengtype-parse.cc: Clean up obsolete parametrized structs
	remnants.
	* gengtype.cc: Likewise.
	* gengtype.h: Likewise.
---
 gcc/gengtype-parse.cc | 2 --
 gcc/gengtype.cc       | 6 ++----
 gcc/gengtype.h        | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/gcc/gengtype-parse.cc b/gcc/gengtype-parse.cc
index 8791b35a3da..6b6331cc228 100644
--- a/gcc/gengtype-parse.cc
+++ b/gcc/gengtype-parse.cc
@@ -82,7 +82,6 @@  static const char *const token_names[] = {
   "ptr_alias",
   "nested_ptr",
   "user",
-  "a param<N>_is option",
   "a number",
   "a scalar type",
   "an identifier",
@@ -95,7 +94,6 @@  static const char *const token_names[] = {
 /* This array is indexed by token code minus FIRST_TOKEN_WITH_VALUE.  */
 /* Keep in sync with 'gengtype.h:enum gty_token'.  */
 static const char *const token_value_format[] = {
-  "%s",
   "'%s'",
   "'%s'",
   "'%s'",
diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc
index 54d3c8aaec3..49ddba684af 100644
--- a/gcc/gengtype.cc
+++ b/gcc/gengtype.cc
@@ -1388,8 +1388,6 @@  adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt))
    At present:
    - Converts pointer-to-char, with no length parameter, to TYPE_STRING;
    - Similarly for arrays of pointer-to-char;
-   - Converts structures for which a parameter is provided to
-     TYPE_PARAM_STRUCT;
    - Handles "special" options.
 */
 
@@ -3654,7 +3652,7 @@  write_func_for_structure (type_p orig_s, type_p s,
 }
 
 
-/* Write out marker routines for STRUCTURES and PARAM_STRUCTS.  */
+/* Write out marker routines for STRUCTURES.  */
 
 static void
 write_types (outf_p output_header, type_p structures,
@@ -4002,7 +4000,7 @@  write_local_func_for_structure (const_type_p orig_s, type_p s)
       }
 }
 
-/* Write out local marker routines for STRUCTURES and PARAM_STRUCTS.  */
+/* Write out local marker routines for STRUCTURES.  */
 
 static void
 write_local (outf_p output_header, type_p structures)
diff --git a/gcc/gengtype.h b/gcc/gengtype.h
index 2122373edf2..13942900910 100644
--- a/gcc/gengtype.h
+++ b/gcc/gengtype.h
@@ -478,7 +478,6 @@  enum gty_token
   PTR_ALIAS,
   NESTED_PTR,
   USER_GTY,
-  UNUSED_PARAM_IS,
   NUM,
   SCALAR,
   ID,
@@ -489,7 +488,7 @@  enum gty_token
 
   /* print_token assumes that any token >= FIRST_TOKEN_WITH_VALUE may have
      a meaningful value to be printed.  */
-  FIRST_TOKEN_WITH_VALUE = UNUSED_PARAM_IS
+  FIRST_TOKEN_WITH_VALUE = NUM
 };
 
 
-- 
2.34.1