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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9f454193905c5569bb508c0f805231117444faee..38f6f11af2602441e5f8e70b376af281f9d696ec 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+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>
 
        PR c++/90947

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 5c2c48f4253daad429f865d798df593d6bf8856b..3c83b7f7f69ba6cecbdb26c82d3893b92e0683e4 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -5956,8 +5956,9 @@ arm_get_pcs_model (const_tree type, const_tree decl)
             so we are free to use whatever conventions are
             appropriate.  */
          /* FIXME: remove CONST_CAST_TREE when cgraph is constified.  */
-         cgraph_local_info *i = cgraph_node::local_info (CONST_CAST_TREE(decl));
-         if (i && i->local)
+         cgraph_node *local_info_node
+           = cgraph_node::local_info_node (CONST_CAST_TREE (decl));
+         if (local_info_node && local_info_node->local)
            return ARM_PCS_AAPCS_LOCAL;
        }
     }

diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index fbe4c10a8c891bdc15e341bd1be8e6a6ce1eed05..b646d03f146440c4baba792d964c480e25ed30b4 100644 (file)
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -1036,14 +1036,14 @@ expand_interrupt_handler_epilogue (rtx spreg, e_funkind fkind, bool all)
 static rtx
 bfin_load_pic_reg (rtx dest)
 {
-  struct cgraph_local_info *i = NULL;
   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
      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;
       
   if (global_options_set.x_bfin_library_id)
@@ -1806,7 +1806,7 @@ static bool
 bfin_function_ok_for_sibcall (tree decl 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));
   if (fkind != SUBROUTINE)
     return false;
@@ -1821,9 +1821,9 @@ bfin_function_ok_for_sibcall (tree decl ATTRIBUTE_UNUSED,
   if (!decl)
     /* Not enough information.  */
     return false;
- 
-  this_func = cgraph_node::local_info (current_function_decl);
-  called_func = cgraph_node::local_info (decl);
+
+  this_func = cgraph_node::local_info_node (current_function_decl);
+  called_func = cgraph_node::local_info_node (decl);
   if (!called_func)
     return false;
   return !called_func->local || this_func->local;

diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index f8e8295245baa99baf6e32bd1bee2813164aa07d..a6ff25fb7548c623a90ad6b4fa6d00d8fc1c7745 100644 (file)
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -1158,13 +1158,13 @@ c6x_function_ok_for_sibcall (tree decl, tree exp)
       /* When compiling for DSBT, the calling function must be local,
         so that when we reload B14 in the sibcall epilogue, it will
         not change its value.  */
-      struct cgraph_local_info *this_func;
 
       if (!decl)
        /* Not enough information.  */
        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;
     }
 
@@ -2516,14 +2516,13 @@ struct c6x_frame
 static bool
 must_reload_pic_reg_p (void)
 {
-  struct cgraph_local_info *i = NULL;
-
   if (!TARGET_DSBT)
     return false;
 
-  i = cgraph_node::local_info (current_function_decl);
-
-  if ((crtl->uses_pic_offset_table || !crtl->is_leaf) && !i->local)
+  cgraph_node *local_info_node
+    = cgraph_node::local_info_node (current_function_decl);
+  if ((crtl->uses_pic_offset_table || !crtl->is_leaf)
+      && !local_info_node->local)
     return true;
   return false;
 }