2012-04-23 Basile Starynkevitch <basile@starynkevitch.net>

	MELT branch merged with trunk rev 186692 using svnmerge

[gcc/]

2012-04-23  Basile Starynkevitch  <basile@starynkevitch.net>

	{{improvements for merging with GCC 4.8 trunk svn rev 186692}}
	* melt-run.proto.h (MELT_GCC_VERSION): Define, if unknown, in the
	generated melt-run.h

	* melt-runtime.c (melt_val2passflag): TODO_dump_func &
	TODO_dump_cgraph don't exist in GCC 4.8.

	* melt-build.tpl: Say flavor, not variant!  Build first the
	quicklybuilt application modules, to catch error in macro C
	strings...

	* melt-build.mk: Regenerate.

	* melt/warmelt-base.melt (valdesc_strbuf): Check for MELT_GCC_VERSION also.

	* melt/warmelt-genobj.melt (compilobj_nrep_citeration): Use
	meltcit prefix in generated citerator names..

	* melt/warmelt-outobj.melt (syntestgen_citerator): Use
	meltcitstate prefix.

	* melt/xtramelt-ana-base.melt (each_cgraph_fun_body)
	(each_cgraph_fun_entryblock, each_cgraph_fun_call_flow_graph)
	(each_bb_cfun, with_cfun_decl): Adapt to GCC 4.8, add
	documentation.
	(each_cgraph_decl): Only for GCC 4.6 & 4.7




git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@186705 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 9 insertions, 9 deletions

diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 9dddf393fa7..1997f62538b 100644
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -1203,16 +1203,16 @@ split_function (struct split_point *split_point)
   /* For usual cloning it is enough to clear builtin only when signature
      changes.  For partial inlining we however can not expect the part
      of builtin implementation to have same semantic as the whole.  */
-  if (DECL_BUILT_IN (node->decl))
+  if (DECL_BUILT_IN (node->symbol.decl))
     {
-      DECL_BUILT_IN_CLASS (node->decl) = NOT_BUILT_IN;
-      DECL_FUNCTION_CODE (node->decl) = (enum built_in_function) 0;
+      DECL_BUILT_IN_CLASS (node->symbol.decl) = NOT_BUILT_IN;
+      DECL_FUNCTION_CODE (node->symbol.decl) = (enum built_in_function) 0;
     }
   cgraph_node_remove_callees (cur_node);
   if (!split_part_return_p)
-    TREE_THIS_VOLATILE (node->decl) = 1;
+    TREE_THIS_VOLATILE (node->symbol.decl) = 1;
   if (dump_file)
-    dump_function_to_file (node->decl, dump_file, dump_flags);
+    dump_function_to_file (node->symbol.decl, dump_file, dump_flags);
 
   /* Create the basic block we place call into.  It is the entry basic block
      split after last label.  */
@@ -1237,7 +1237,7 @@ split_function (struct split_point *split_point)
 					false, GSI_CONTINUE_LINKING);
 	VEC_replace (tree, args_to_pass, i, arg);
       }
-  call = gimple_build_call_vec (node->decl, args_to_pass);
+  call = gimple_build_call_vec (node->symbol.decl, args_to_pass);
   gimple_set_block (call, DECL_INITIAL (current_function_decl));
 
   /* We avoid address being taken on any variable used by split part,
@@ -1423,7 +1423,7 @@ execute_split_functions (void)
 	fprintf (dump_file, "Not splitting: not inlinable.\n");
       return 0;
     }
-  if (DECL_DISREGARD_INLINE_LIMITS (node->decl))
+  if (DECL_DISREGARD_INLINE_LIMITS (node->symbol.decl))
     {
       if (dump_file)
 	fprintf (dump_file, "Not splitting: disregarding inline limits.\n");
@@ -1455,8 +1455,8 @@ execute_split_functions (void)
      called once.  It is possible that the caller is called more then once and
      then inlining would still benefit.  */
   if ((!node->callers || !node->callers->next_caller)
-      && !node->address_taken
-      && (!flag_lto || !node->local.externally_visible))
+      && !node->symbol.address_taken
+      && (!flag_lto || !node->symbol.externally_visible))
     {
       if (dump_file)
 	fprintf (dump_file, "Not splitting: not called directly "