|| DECL_INITIAL (decl))
&& !DECL_EXTERNAL (decl))
{
- if (TREE_CODE (decl) != FUNCTION_DECL)
+ /* When reading LTO unit, we also read varpool, so do not
+ rebuild it. */
+ if (in_lto_p && !at_end)
+ ;
+ else if (TREE_CODE (decl) != FUNCTION_DECL)
varpool_finalize_decl (decl);
else
assemble_variable (decl, top_level, at_end, 0);
}
/* Let cgraph know about the existence of variables. */
- if (TREE_CODE (decl) == VAR_DECL && !DECL_EXTERNAL (decl))
+ if (in_lto_p && !at_end)
+ ;
+ else if (TREE_CODE (decl) == VAR_DECL && !DECL_EXTERNAL (decl))
varpool_node (decl);
}
static void
ipa_write_summaries_2 (struct opt_pass *pass, cgraph_node_set set,
+ varpool_node_set vset,
struct lto_out_decl_state *state)
{
while (pass)
if (pass->tv_id)
timevar_push (pass->tv_id);
- ipa_pass->write_summary (set);
+ ipa_pass->write_summary (set,vset);
/* If a timevar is present, start it. */
if (pass->tv_id)
}
if (pass->sub && pass->sub->type != GIMPLE_PASS)
- ipa_write_summaries_2 (pass->sub, set, state);
+ ipa_write_summaries_2 (pass->sub, set, vset, state);
pass = pass->next;
}
summaries. SET is the set of nodes to be written. */
static void
-ipa_write_summaries_1 (cgraph_node_set set)
+ipa_write_summaries_1 (cgraph_node_set set, varpool_node_set vset)
{
struct lto_out_decl_state *state = lto_new_out_decl_state ();
lto_push_out_decl_state (state);
gcc_assert (!flag_wpa);
- ipa_write_summaries_2 (all_regular_ipa_passes, set, state);
- ipa_write_summaries_2 (all_lto_gen_passes, set, state);
+ ipa_write_summaries_2 (all_regular_ipa_passes, set, vset, state);
+ ipa_write_summaries_2 (all_lto_gen_passes, set, vset, state);
gcc_assert (lto_get_out_decl_state () == state);
lto_pop_out_decl_state ();
ipa_write_summaries (void)
{
cgraph_node_set set;
+ varpool_node_set vset;
struct cgraph_node **order;
+ struct varpool_node *vnode;
int i, order_pos;
if (!flag_generate_lto || errorcount || sorrycount)
renumber_gimple_stmt_uids ();
pop_cfun ();
}
- cgraph_node_set_add (set, node);
+ if (node->needed || node->reachable || node->address_taken)
+ cgraph_node_set_add (set, node);
}
+ vset = varpool_node_set_new ();
- ipa_write_summaries_1 (set);
+ for (vnode = varpool_nodes; vnode; vnode = vnode->next)
+ if (vnode->needed && !vnode->alias)
+ varpool_node_set_add (vset, vnode);
+
+ ipa_write_summaries_1 (set, vset);
free (order);
ggc_free (set);
+ ggc_free (vset);
}
/* Same as execute_pass_list but assume that subpasses of IPA passes
static void
ipa_write_optimization_summaries_1 (struct opt_pass *pass, cgraph_node_set set,
+ varpool_node_set vset,
struct lto_out_decl_state *state)
{
while (pass)
if (pass->tv_id)
timevar_push (pass->tv_id);
- ipa_pass->write_optimization_summary (set);
+ ipa_pass->write_optimization_summary (set, vset);
/* If a timevar is present, start it. */
if (pass->tv_id)
}
if (pass->sub && pass->sub->type != GIMPLE_PASS)
- ipa_write_optimization_summaries_1 (pass->sub, set, state);
+ ipa_write_optimization_summaries_1 (pass->sub, set, vset, state);
pass = pass->next;
}
NULL, write out all summaries of all nodes. */
void
-ipa_write_optimization_summaries (cgraph_node_set set)
+ipa_write_optimization_summaries (cgraph_node_set set, varpool_node_set vset)
{
struct lto_out_decl_state *state = lto_new_out_decl_state ();
lto_push_out_decl_state (state);
gcc_assert (flag_wpa);
- ipa_write_optimization_summaries_1 (all_regular_ipa_passes, set, state);
- ipa_write_optimization_summaries_1 (all_lto_gen_passes, set, state);
+ ipa_write_optimization_summaries_1 (all_regular_ipa_passes, set, vset, state);
+ ipa_write_optimization_summaries_1 (all_lto_gen_passes, set, vset, state);
gcc_assert (lto_get_out_decl_state () == state);
lto_pop_out_decl_state ();