Commit 83f58fe3 by Martin Liska Committed by Martin Liska

Remove missing usage of cgraph_local_info in arm,bfin and c6x.

2019-10-31  Martin Liska  <mliska@suse.cz>

	* config/arm/arm.c (arm_get_pcs_model): Remove usage
	of cgraph_local_info and use local_info_node instead.
	* config/bfin/bfin.c (bfin_load_pic_reg): Likewise.
	(bfin_function_ok_for_sibcall): Likewise.
	* config/c6x/c6x.c (c6x_function_ok_for_sibcall): Likewise.
	(must_reload_pic_reg_p): Likewise.

From-SVN: r277657
parent fbdbe8b0
2019-10-31 Martin Liska <mliska@suse.cz>
* config/arm/arm.c (arm_get_pcs_model): Remove usage
of cgraph_local_info and use local_info_node instead.
* config/bfin/bfin.c (bfin_load_pic_reg): Likewise.
(bfin_function_ok_for_sibcall): Likewise.
* config/c6x/c6x.c (c6x_function_ok_for_sibcall): Likewise.
(must_reload_pic_reg_p): Likewise.
2019-10-31 Jakub Jelinek <jakub@redhat.com> 2019-10-31 Jakub Jelinek <jakub@redhat.com>
PR c++/90947 PR c++/90947
...@@ -5956,8 +5956,9 @@ arm_get_pcs_model (const_tree type, const_tree decl) ...@@ -5956,8 +5956,9 @@ arm_get_pcs_model (const_tree type, const_tree decl)
so we are free to use whatever conventions are so we are free to use whatever conventions are
appropriate. */ appropriate. */
/* FIXME: remove CONST_CAST_TREE when cgraph is constified. */ /* FIXME: remove CONST_CAST_TREE when cgraph is constified. */
cgraph_local_info *i = cgraph_node::local_info (CONST_CAST_TREE(decl)); cgraph_node *local_info_node
if (i && i->local) = cgraph_node::local_info_node (CONST_CAST_TREE (decl));
if (local_info_node && local_info_node->local)
return ARM_PCS_AAPCS_LOCAL; return ARM_PCS_AAPCS_LOCAL;
} }
} }
......
...@@ -1036,14 +1036,14 @@ expand_interrupt_handler_epilogue (rtx spreg, e_funkind fkind, bool all) ...@@ -1036,14 +1036,14 @@ expand_interrupt_handler_epilogue (rtx spreg, e_funkind fkind, bool all)
static rtx static rtx
bfin_load_pic_reg (rtx dest) bfin_load_pic_reg (rtx dest)
{ {
struct cgraph_local_info *i = NULL;
rtx addr; rtx addr;
i = cgraph_node::local_info (current_function_decl); cgraph_node *local_info_node
= cgraph_node::local_info_node (current_function_decl);
/* Functions local to the translation unit don't need to reload the /* Functions local to the translation unit don't need to reload the
pic reg, since the caller always passes a usable one. */ pic reg, since the caller always passes a usable one. */
if (i && i->local) if (local_info_node && local_info_node->local)
return pic_offset_table_rtx; return pic_offset_table_rtx;
if (global_options_set.x_bfin_library_id) if (global_options_set.x_bfin_library_id)
...@@ -1806,7 +1806,7 @@ static bool ...@@ -1806,7 +1806,7 @@ static bool
bfin_function_ok_for_sibcall (tree decl ATTRIBUTE_UNUSED, bfin_function_ok_for_sibcall (tree decl ATTRIBUTE_UNUSED,
tree exp ATTRIBUTE_UNUSED) tree exp ATTRIBUTE_UNUSED)
{ {
struct cgraph_local_info *this_func, *called_func; cgraph_node *this_func, *called_func;
e_funkind fkind = funkind (TREE_TYPE (current_function_decl)); e_funkind fkind = funkind (TREE_TYPE (current_function_decl));
if (fkind != SUBROUTINE) if (fkind != SUBROUTINE)
return false; return false;
...@@ -1821,9 +1821,9 @@ bfin_function_ok_for_sibcall (tree decl ATTRIBUTE_UNUSED, ...@@ -1821,9 +1821,9 @@ bfin_function_ok_for_sibcall (tree decl ATTRIBUTE_UNUSED,
if (!decl) if (!decl)
/* Not enough information. */ /* Not enough information. */
return false; return false;
this_func = cgraph_node::local_info (current_function_decl); this_func = cgraph_node::local_info_node (current_function_decl);
called_func = cgraph_node::local_info (decl); called_func = cgraph_node::local_info_node (decl);
if (!called_func) if (!called_func)
return false; return false;
return !called_func->local || this_func->local; return !called_func->local || this_func->local;
......
...@@ -1158,13 +1158,13 @@ c6x_function_ok_for_sibcall (tree decl, tree exp) ...@@ -1158,13 +1158,13 @@ c6x_function_ok_for_sibcall (tree decl, tree exp)
/* When compiling for DSBT, the calling function must be local, /* When compiling for DSBT, the calling function must be local,
so that when we reload B14 in the sibcall epilogue, it will so that when we reload B14 in the sibcall epilogue, it will
not change its value. */ not change its value. */
struct cgraph_local_info *this_func;
if (!decl) if (!decl)
/* Not enough information. */ /* Not enough information. */
return false; return false;
this_func = cgraph_node::local_info (current_function_decl); cgraph_node *this_func
= cgraph_node::local_info_node (current_function_decl);
return this_func->local; return this_func->local;
} }
...@@ -2516,14 +2516,13 @@ struct c6x_frame ...@@ -2516,14 +2516,13 @@ struct c6x_frame
static bool static bool
must_reload_pic_reg_p (void) must_reload_pic_reg_p (void)
{ {
struct cgraph_local_info *i = NULL;
if (!TARGET_DSBT) if (!TARGET_DSBT)
return false; return false;
i = cgraph_node::local_info (current_function_decl); cgraph_node *local_info_node
= cgraph_node::local_info_node (current_function_decl);
if ((crtl->uses_pic_offset_table || !crtl->is_leaf) && !i->local) if ((crtl->uses_pic_offset_table || !crtl->is_leaf)
&& !local_info_node->local)
return true; return true;
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment