Patchwork [v2,6/6] Update hand-written GTY routines for type renaming

login
register
mail settings
Submitter David Malcolm
Date Sept. 9, 2013, 7:32 p.m.
Message ID <1378755140-5555-7-git-send-email-dmalcolm@redhat.com>
Download mbox | patch
Permalink /patch/273659/
State New
Headers show

Comments

David Malcolm - Sept. 9, 2013, 7:32 p.m.
* cgraph.c (gt_ggc_mx): Update for renaming of symtab_node_base
	to symtab_node
	(gt_pch_nx): Likewise.
---
 gcc/cgraph.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
Jan Hubicka - Sept. 10, 2013, 1:39 p.m.
> 	* cgraph.c (gt_ggc_mx): Update for renaming of symtab_node_base
> 	to symtab_node
> 	(gt_pch_nx): Likewise.
> ---
>  gcc/cgraph.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/gcc/cgraph.c b/gcc/cgraph.c
> index bb2626d..abbffa1 100644
> --- a/gcc/cgraph.c
> +++ b/gcc/cgraph.c
> @@ -3024,11 +3024,11 @@ void gt_ggc_mx (symtab_node *x)
>      {
>        /* Code common to all symtab nodes. */
>        gt_ggc_m_9tree_node (x->decl);
> -      gt_ggc_mx_symtab_node_base (x->next);
> -      gt_ggc_mx_symtab_node_base (x->previous);
> -      gt_ggc_mx_symtab_node_base (x->next_sharing_asm_name);
> -      gt_ggc_mx_symtab_node_base (x->previous_sharing_asm_name);
> -      gt_ggc_mx_symtab_node_base (x->same_comdat_group);
> +      gt_ggc_mx_symtab_node (x->next);
> +      gt_ggc_mx_symtab_node (x->previous);
> +      gt_ggc_mx_symtab_node (x->next_sharing_asm_name);
> +      gt_ggc_mx_symtab_node (x->previous_sharing_asm_name);
> +      gt_ggc_mx_symtab_node (x->same_comdat_group);

These will go away as dicussed earlier.
Patch is OK with that change.
Honza
>        gt_ggc_m_20vec_ipa_ref_t_va_gc_ (x->ref_list.references);
>        gt_ggc_m_9tree_node (x->alias_target);
>        gt_ggc_m_18lto_file_decl_data (x->lto_file_data);
> @@ -3068,7 +3068,7 @@ void gt_ggc_mx (symtab_node *x)
>  void gt_pch_nx (symtab_node *x)
>  {
>    symtab_node * xlimit = x ? x->next : NULL;
> -  while (gt_pch_note_object (xlimit, xlimit, gt_pch_p_16symtab_node_base))
> +  while (gt_pch_note_object (xlimit, xlimit, gt_pch_p_11symtab_node))
>     xlimit = xlimit->next;
>    if (x != xlimit)
>      for (;;)
> @@ -3077,17 +3077,17 @@ void gt_pch_nx (symtab_node *x)
>          if (xprev == NULL) break;
>          x = xprev;
>          (void) gt_pch_note_object (xprev, xprev,
> -                                   gt_pch_p_16symtab_node_base);
> +                                   gt_pch_p_11symtab_node);
>        }
>    while (x != xlimit)
>      {
>        /* Code common to all symtab nodes. */
>        gt_pch_n_9tree_node (x->decl);
> -      gt_pch_nx_symtab_node_base (x->next);
> -      gt_pch_nx_symtab_node_base (x->previous);
> -      gt_pch_nx_symtab_node_base (x->next_sharing_asm_name);
> -      gt_pch_nx_symtab_node_base (x->previous_sharing_asm_name);
> -      gt_pch_nx_symtab_node_base (x->same_comdat_group);
> +      gt_pch_nx_symtab_node (x->next);
> +      gt_pch_nx_symtab_node (x->previous);
> +      gt_pch_nx_symtab_node (x->next_sharing_asm_name);
> +      gt_pch_nx_symtab_node (x->previous_sharing_asm_name);
> +      gt_pch_nx_symtab_node (x->same_comdat_group);
>        gt_pch_n_20vec_ipa_ref_t_va_gc_ (x->ref_list.references);
>        gt_pch_n_9tree_node (x->alias_target);
>        gt_pch_n_18lto_file_decl_data (x->lto_file_data);
> -- 
> 1.7.11.7

Patch

diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index bb2626d..abbffa1 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -3024,11 +3024,11 @@  void gt_ggc_mx (symtab_node *x)
     {
       /* Code common to all symtab nodes. */
       gt_ggc_m_9tree_node (x->decl);
-      gt_ggc_mx_symtab_node_base (x->next);
-      gt_ggc_mx_symtab_node_base (x->previous);
-      gt_ggc_mx_symtab_node_base (x->next_sharing_asm_name);
-      gt_ggc_mx_symtab_node_base (x->previous_sharing_asm_name);
-      gt_ggc_mx_symtab_node_base (x->same_comdat_group);
+      gt_ggc_mx_symtab_node (x->next);
+      gt_ggc_mx_symtab_node (x->previous);
+      gt_ggc_mx_symtab_node (x->next_sharing_asm_name);
+      gt_ggc_mx_symtab_node (x->previous_sharing_asm_name);
+      gt_ggc_mx_symtab_node (x->same_comdat_group);
       gt_ggc_m_20vec_ipa_ref_t_va_gc_ (x->ref_list.references);
       gt_ggc_m_9tree_node (x->alias_target);
       gt_ggc_m_18lto_file_decl_data (x->lto_file_data);
@@ -3068,7 +3068,7 @@  void gt_ggc_mx (symtab_node *x)
 void gt_pch_nx (symtab_node *x)
 {
   symtab_node * xlimit = x ? x->next : NULL;
-  while (gt_pch_note_object (xlimit, xlimit, gt_pch_p_16symtab_node_base))
+  while (gt_pch_note_object (xlimit, xlimit, gt_pch_p_11symtab_node))
    xlimit = xlimit->next;
   if (x != xlimit)
     for (;;)
@@ -3077,17 +3077,17 @@  void gt_pch_nx (symtab_node *x)
         if (xprev == NULL) break;
         x = xprev;
         (void) gt_pch_note_object (xprev, xprev,
-                                   gt_pch_p_16symtab_node_base);
+                                   gt_pch_p_11symtab_node);
       }
   while (x != xlimit)
     {
       /* Code common to all symtab nodes. */
       gt_pch_n_9tree_node (x->decl);
-      gt_pch_nx_symtab_node_base (x->next);
-      gt_pch_nx_symtab_node_base (x->previous);
-      gt_pch_nx_symtab_node_base (x->next_sharing_asm_name);
-      gt_pch_nx_symtab_node_base (x->previous_sharing_asm_name);
-      gt_pch_nx_symtab_node_base (x->same_comdat_group);
+      gt_pch_nx_symtab_node (x->next);
+      gt_pch_nx_symtab_node (x->previous);
+      gt_pch_nx_symtab_node (x->next_sharing_asm_name);
+      gt_pch_nx_symtab_node (x->previous_sharing_asm_name);
+      gt_pch_nx_symtab_node (x->same_comdat_group);
       gt_pch_n_20vec_ipa_ref_t_va_gc_ (x->ref_list.references);
       gt_pch_n_9tree_node (x->alias_target);
       gt_pch_n_18lto_file_decl_data (x->lto_file_data);