From 51705ec128f47bf0bc7615aa5b72445c45fd1657 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 24 Jul 2014 16:17:57 +0200 Subject: [PATCH] Another MIPS/R6000 IPA C++ refactoring fix. * mips.c (mips_start_unique_function): Correct cgraph_node function used. * rs6000.c (call_ABI_of_interest): Likewise. (rs6000_code_end): Likewise. From-SVN: r212995 --- config/ChangeLog | 6 ++++++ gcc/config/mips/mips.c | 2 +- gcc/config/rs6000/rs6000.c | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 85f18e78c4fa..c509972e7853 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +2014-07-24 Martin Liska + * mips.c (mips_start_unique_function): Correct cgraph_node function + used. + * rs6000.c (call_ABI_of_interest): Likewise. + (rs6000_code_end): Likewise. + 2014-07-24 Martin Liska * rs6000.c (rs6000_xcoff_declare_function_name): Correct symtab_node diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index d35e98e47a08..3876da8d1ba4 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -6286,7 +6286,7 @@ mips_start_unique_function (const char *name) TREE_PUBLIC (decl) = 1; TREE_STATIC (decl) = 1; - cgraph_create_node (decl)->set_comdat_group (DECL_ASSEMBLER_NAME (decl)); + cgraph_node::create (decl)->set_comdat_group (DECL_ASSEMBLER_NAME (decl)); targetm.asm_out.unique_section (decl, 0); switch_to_section (get_named_section (decl, NULL, 0)); diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 2466402f33fc..02fc5d904921 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -8967,9 +8967,9 @@ call_ABI_of_interest (tree fndecl) return true; /* Interesting functions that we are emitting in this object file. */ - c_node = cgraph_get_node (fndecl); - c_node = cgraph_function_or_thunk_node (c_node, NULL); - return !cgraph_only_called_directly_p (c_node); + c_node = cgraph_node::get (fndecl); + c_node = c_node->ultimate_alias_target (); + return !c_node->only_called_directly_p (); } return false; } @@ -32533,7 +32533,7 @@ rs6000_code_end (void) #if RS6000_WEAK if (USE_HIDDEN_LINKONCE) { - cgraph_create_node (decl)->set_comdat_group (DECL_ASSEMBLER_NAME (decl)); + cgraph_node::create (decl)->set_comdat_group (DECL_ASSEMBLER_NAME (decl)); targetm.asm_out.unique_section (decl, 0); switch_to_section (get_named_section (decl, NULL, 0)); DECL_WEAK (decl) = 1; -- 2.47.3