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

diff --git a/config/ChangeLog b/config/ChangeLog
index 85f18e78c4fa62a63a82f9495fd7becb46b4bbe7..c509972e78539afe465a9b889e9541dfb3024d7b 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-24  Martin Liska  <mliska@suse.cz>
+       * 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  <mliska@suse.cz>
 
        * 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 d35e98e47a08b37bb4242d0ef686f0979e826e73..3876da8d1ba4c3f30fa259bd18a7181805310740 100644 (file)
--- 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 2466402f33fc68ca6a46c6f7de87f032d0231144..02fc5d90492167e776a5a9ef4de26f9a07eae0bc 100644 (file)
--- 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;