From: hubicka Date: Wed, 23 Oct 2019 19:03:42 +0000 (+0000) Subject: * ipa-reference.c (varpool_removal_hook, ipa_reference_c_finalize): Fix X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04de801fabce5a321e421e3292f426a571d4468b;p=thirdparty%2Fgcc.git * ipa-reference.c (varpool_removal_hook, ipa_reference_c_finalize): Fix previous patch. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@277347 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d68bc8a5524b..d6c0c9ec6ee0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-10-23 Jan Hubicka + + * ipa-reference.c (varpool_removal_hook, ipa_reference_c_finalize): Fix + previous patch. + 2019-10-23 Jan Hubicka * lto-streamer-out.c (output_constructor): Push CTORS_OUT timevar. diff --git a/gcc/ipa-reference.c b/gcc/ipa-reference.c index 1e35438bdd85..87d583fff0fc 100644 --- a/gcc/ipa-reference.c +++ b/gcc/ipa-reference.c @@ -436,9 +436,7 @@ propagate_bits (ipa_reference_global_vars_info_t x_global, struct cgraph_node *x static void varpool_removal_hook (varpool_node *node, void *) { - int *id = ipa_reference_vars_map->get (node->decl) - if (id) - ipa_reference_vars_map->remove (*id); + ipa_reference_vars_map->remove (node->decl); } static bool ipa_init_p = false; @@ -1291,7 +1289,7 @@ ipa_reference_c_finalize (void) ipa_ref_opt_sum_summaries = NULL; delete ipa_reference_vars_map; ipa_reference_vars_map = NULL; - symtab->remove_varpool_removal_hook (varpool_node_hooks) + symtab->remove_varpool_removal_hook (varpool_node_hooks); } if (ipa_init_p)