Patchwork [COMMITTED,PR,46823] Get fndecl from cgraph_edge when inlining

login
register
mail settings
Submitter Martin Jambor
Date Jan. 14, 2011, 12:02 p.m.
Message ID <20110114120242.GA27582@virgil.arch.suse.de>
Download mbox | patch
Permalink /patch/78888/
State New
Headers show

Comments

Martin Jambor - Jan. 14, 2011, 12:02 p.m.
Hi,

based on Honza's approval in bugzilla I have committed the following
to fix PR 46823 as revision 168778 (after bootstrapping and testing on
x86_64-linux).  I'll try again to add a testcase but so far I did not
have much luck with it.

I will prepare a followup cleanup patch moving the
id->dst_node->analyzed check to gimple_expand_calls_inline for 4.7.

Thanks,

Martin


2011-01-14  Martin Jambor  <mjambor@suse.cz>

	PR middle-end/46823
	* tree-inline.c (expand_call_inline): Get fndecl from call graph edge.

Patch

Index: icln/gcc/tree-inline.c
===================================================================
--- icln.orig/gcc/tree-inline.c
+++ icln/gcc/tree-inline.c
@@ -3783,14 +3783,19 @@  expand_call_inline (basic_block bb, gimp
   if (gimple_code (stmt) != GIMPLE_CALL)
     goto egress;
 
+  /* Objective C and fortran still calls tree_rest_of_compilation directly.
+     Kill this check once this is fixed.  */
+  if (!id->dst_node->analyzed)
+    goto egress;
+
+  cg_edge = cgraph_edge (id->dst_node, stmt);
+  gcc_checking_assert (cg_edge);
   /* First, see if we can figure out what function is being called.
      If we cannot, then there is no hope of inlining the function.  */
-  fn = gimple_call_fndecl (stmt);
-  if (!fn)
+  if (cg_edge->indirect_unknown_callee)
     goto egress;
-
-  /* Turn forward declarations into real ones.  */
-  fn = cgraph_node (fn)->decl;
+  fn = cg_edge->callee->decl;
+  gcc_checking_assert (fn);
 
   /* If FN is a declaration of a function in a nested scope that was
      globally declared inline, we don't set its DECL_INITIAL.
@@ -3804,13 +3809,6 @@  expand_call_inline (basic_block bb, gimp
       && gimple_has_body_p (DECL_ABSTRACT_ORIGIN (fn)))
     fn = DECL_ABSTRACT_ORIGIN (fn);
 
-  /* Objective C and fortran still calls tree_rest_of_compilation directly.
-     Kill this check once this is fixed.  */
-  if (!id->dst_node->analyzed)
-    goto egress;
-
-  cg_edge = cgraph_edge (id->dst_node, stmt);
-
   /* First check that inlining isn't simply forbidden in this case.  */
   if (inline_forbidden_into_p (cg_edge->caller->decl, cg_edge->callee->decl))
     goto egress;