From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4473 invoked by alias); 10 Jun 2011 18:29:50 -0000 Received: (qmail 4465 invoked by uid 22791); 10 Jun 2011 18:29:49 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from nikam.ms.mff.cuni.cz (HELO nikam.ms.mff.cuni.cz) (195.113.20.16) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 10 Jun 2011 18:29:33 +0000 Received: by nikam.ms.mff.cuni.cz (Postfix, from userid 16202) id BCF4A9AC877; Fri, 10 Jun 2011 20:29:31 +0200 (CEST) Date: Fri, 10 Jun 2011 18:32:00 -0000 From: Jan Hubicka To: gcc-patches@gcc.gnu.org, mjambor@suse.cz Subject: Cgraph alias reorg 10/14 (C++ fe tweek) Message-ID: <20110610182931.GI28776@kam.mff.cuni.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2011-06/txt/msg00872.txt.bz2 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