From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19546 invoked by alias); 11 Jun 2011 14:22:27 -0000 Received: (qmail 19534 invoked by uid 22791); 11 Jun 2011 14:22:27 -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; Sat, 11 Jun 2011 14:22:11 +0000 Received: by nikam.ms.mff.cuni.cz (Postfix, from userid 16202) id F37C49AC7D1; Sat, 11 Jun 2011 16:22:09 +0200 (CEST) Date: Sat, 11 Jun 2011 14:50:00 -0000 From: Jan Hubicka To: gcc-patches@gcc.gnu.org Subject: Cgraph alias reorg 17/14 (fix ipa-prop computation of varying args) Message-ID: <20110611142209.GB3871@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/msg00907.txt.bz2 Hi, while breaking up the patch Imissed two pots in ipa-prop, where we need to walk aliases. This leads to segfault while compiling Mozilla. Also because alled_with_var_arguments is recomputed at IPA time, we don't need to stream it. Bootstrapped/regtested x86_64-linux, comitted. Honza Index: ChangeLog =================================================================== --- ChangeLog (revision 174954) +++ ChangeLog (working copy) @@ -1,5 +1,12 @@ 2011-06-11 Jan Hubicka + * ipa-prop.c (ipa_make_edge_direct_to_target): Fix code setting varying args. + (ipa_update_after_lto_read): Likewise. + (ipa_write_node_info): Do not sream call_with_var_arguments. + (ipa_read_node_info): Likewise. + +2011-06-11 Jan Hubicka + * ipa.c (cgraph_comdat_can_be_unshared_p): Fix pasto. 2011-06-11 Jan Hubicka Index: ipa-prop.c =================================================================== --- ipa-prop.c (revision 174951) +++ ipa-prop.c (working copy) @@ -1719,6 +1719,7 @@ ipa_make_edge_direct_to_target (struct c fprintf (dump_file, "\n"); } } + callee = cgraph_function_or_thunk_node (callee, NULL); if (ipa_get_cs_argument_count (IPA_EDGE_REF (ie)) != ipa_get_param_count (IPA_NODE_REF (callee))) @@ -2815,7 +2816,6 @@ ipa_write_node_info (struct output_block lto_output_uleb128_stream (ob->main_stream, node_ref); bp = bitpack_create (ob->main_stream); - bp_pack_value (&bp, info->called_with_var_arguments, 1); gcc_assert (info->uses_analysis_done || ipa_get_param_count (info) == 0); gcc_assert (!info->node_enqueued); @@ -2858,7 +2858,6 @@ ipa_read_node_info (struct lto_input_blo ipa_initialize_node_params (node); bp = lto_input_bitpack (ib); - info->called_with_var_arguments = bp_unpack_value (&bp, 1); if (ipa_get_param_count (info) != 0) info->uses_analysis_done = true; info->node_enqueued = false; @@ -3015,9 +3014,12 @@ ipa_update_after_lto_read (void) if (node->analyzed) for (cs = node->callees; cs; cs = cs->next_callee) { + struct cgraph_node *callee; + + callee = cgraph_function_or_thunk_node (cs->callee, NULL); if (ipa_get_cs_argument_count (IPA_EDGE_REF (cs)) - != ipa_get_param_count (IPA_NODE_REF (cs->callee))) - ipa_set_called_with_variable_arg (IPA_NODE_REF (cs->callee)); + != ipa_get_param_count (IPA_NODE_REF (callee))) + ipa_set_called_with_variable_arg (IPA_NODE_REF (callee)); } }