From: Martin Liska <mliska@suse.cz>
Date: Thu, 24 Jul 2014 16:14:39 +0000 (+0200)
Subject: ADA fixed for symtab_node issues.
X-Git-Tag: releases/gcc-5.1.0~6101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=037e55737efb95c6068fbcc740fc8f16a0cf7939;p=thirdparty%2Fgcc.git

ADA fixed for symtab_node issues.

        * gcc-interface/trans.c (finalize_nrv): Correct cgraph_node (symtab_node)
	function used.
	* gcc-interface/utils.c (rest_of_subprog_body_compilation): Likewise.
	(gnat_write_global_declarations): Likewise.

From-SVN: r213007
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 613d2db5528d..d81f616df330 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-24  Martin Liska  <mliska@suse.cz>
+
+	* gcc-interface/trans.c (finalize_nrv): Correct cgraph_node (symtab_node)
+	function used.
+	* gcc-interface/utils.c (rest_of_subprog_body_compilation): Likewise.
+	(gnat_write_global_declarations): Likewise.
+
 2014-07-19  David Wohlferd  <dw@LimeGreenSocks.com>
 
 	* gnat_rm.texi: Clean up for makeinfo 5.2.
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index e0ecf065c7dc..f42ac7f3388d 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -3361,7 +3361,7 @@ finalize_nrv (tree fndecl, bitmap nrv, vec<tree, va_gc> *other, Node_Id gnat_ret
     return;
 
   /* Prune also the candidates that are referenced by nested functions.  */
-  node = cgraph_get_create_node (fndecl);
+  node = cgraph_node::get_create (fndecl);
   for (node = node->nested; node; node = node->next_nested)
     walk_tree_without_duplicates (&DECL_SAVED_TREE (node->decl), prune_nrv_r,
 				  &data);
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index 022bca7fead0..2c15c98f0aac 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -2802,7 +2802,7 @@ rest_of_subprog_body_compilation (tree subprog_decl)
   else
     /* Register this function with cgraph just far enough to get it
        added to our parent's nested function list.  */
-    (void) cgraph_get_create_node (subprog_decl);
+    (void) cgraph_node::get_create (subprog_decl);
 }
 
 tree
@@ -5757,7 +5757,7 @@ gnat_write_global_declarations (void)
 		      void_type_node);
       DECL_HARD_REGISTER (dummy_global) = 1;
       TREE_STATIC (dummy_global) = 1;
-      node = varpool_node_for_decl (dummy_global);
+      node = varpool_node::get_create (dummy_global);
       node->definition = 1;
       node->force_output = 1;