Hi,
this patch makes C++ FE to use cgraph_for_node_and_aliases instead of doing it 
on its
own.  It helps the transition to new aliases since I don't have to update the 
code in question.

Bootstrapped/regtested x86_64-linux, comitted as obvoius.

Honza

        * decl2.c (clear_decl_external): New functoin.
        (cp_write_global_declarations): Use it.
Index: cp/decl2.c
===================================================================
*** cp/decl2.c  (revision 174913)
--- cp/decl2.c  (working copy)
*************** collect_all_refs (const char *source_fil
*** 3635,3640 ****
--- 3635,3649 ----
    collect_ada_namespace (global_namespace, source_file);
  }
  
+ /* Clear DECL_EXTERNAL for NODE.  */
+ 
+ static bool
+ clear_decl_external (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED)
+ {
+   DECL_EXTERNAL (node->decl) = 0;
+   return false;
+ }
+ 
  /* This routine is called at the end of compilation.
     Its job is to create all the code needed to initialize and
     destroy the global aggregates.  We do the destruction
*************** cp_write_global_declarations (void)
*** 3857,3873 ****
              && DECL_INITIAL (decl)
              && decl_needed_p (decl))
            {
!             struct cgraph_node *node = cgraph_get_node (decl), *alias, *next;
  
!             DECL_EXTERNAL (decl) = 0;
!             /* If we mark !DECL_EXTERNAL one of the same body aliases,
!                we need to mark all of them that way.  */
!             if (node && node->same_body)
!               {
!                 DECL_EXTERNAL (node->decl) = 0;
!                 for (alias = node->same_body; alias; alias = alias->next)
!                   DECL_EXTERNAL (alias->decl) = 0;
!               }
              /* If we mark !DECL_EXTERNAL one of the symbols in some comdat
                 group, we need to mark all symbols in the same comdat group
                 that way.  */
--- 3866,3880 ----
              && DECL_INITIAL (decl)
              && decl_needed_p (decl))
            {
!             struct cgraph_node *node, *next;
  
!             node = cgraph_get_node (decl);
!             if (node->alias
!                 && VEC_length (ipa_ref_t, node->ref_list.references))
!               node = cgraph_alias_aliased_node (node);
! 
!             cgraph_for_node_and_aliases (node, clear_decl_external,
!                                          NULL, true);
              /* If we mark !DECL_EXTERNAL one of the symbols in some comdat
                 group, we need to mark all symbols in the same comdat group
                 that way.  */
*************** cp_write_global_declarations (void)
*** 3875,3890 ****
                for (next = node->same_comdat_group;
                     next != node;
                     next = next->same_comdat_group)
!                 {
!                   DECL_EXTERNAL (next->decl) = 0;
!                   if (next->same_body)
!                     {
!                       for (alias = next->same_body;
!                            alias;
!                            alias = alias->next)
!                         DECL_EXTERNAL (alias->decl) = 0;
!                     }
!                 }
            }
  
          /* If we're going to need to write this function out, and
--- 3882,3889 ----
                for (next = node->same_comdat_group;
                     next != node;
                     next = next->same_comdat_group)
!                 cgraph_for_node_and_aliases (next, clear_decl_external,
!                                              NULL, true);
            }
  
          /* If we're going to need to write this function out, and

Reply via email to