Patchwork Fix tramp3d -fprofile-generate compilation

login
register
mail settings
Submitter Jan Hubicka
Date July 10, 2010, 12:13 a.m.
Message ID <20100710001313.GJ9621@kam.mff.cuni.cz>
Download mbox | patch
Permalink /patch/58445/
State New
Headers show

Comments

Jan Hubicka - July 10, 2010, 12:13 a.m.
Hi,
while fixing DECL_BY_VALUE returning in inliner, I forgot to take care
of non-ssa inlining.

Bootstrapped/regtested x86_64-linux and comitted as obvious.

Patch

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 162023)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@ 
+2010-07-09  Jan Hubicka  <jh@suse.cz>
+
+	* tree-inline.c (declare_return_variable): Fix ICE while
+	inlining DECL_BY_VALUE function not in SSA form
+
 2010-07-09  Changpeng Fang  <changpeng.fang@amd.com>
 
 	PR tree-optimization/44576
Index: tree-inline.c
===================================================================
--- tree-inline.c	(revision 161965)
+++ tree-inline.c	(working copy)
@@ -2903,7 +2903,10 @@  declare_return_variable (copy_body_data 
 	  add_referenced_var (temp);
 	}
       insert_decl_map (id, result, temp);
-      temp = remap_ssa_name (gimple_default_def (id->src_cfun, result), id);
+      /* When RESULT_DECL is in SSA form, we need to use it's default_def
+	 SSA_NAME.  */
+      if (gimple_in_ssa_p (id->src_cfun) && gimple_default_def (id->src_cfun, result))
+        temp = remap_ssa_name (gimple_default_def (id->src_cfun, result), id);
       insert_init_stmt (id, entry_bb, gimple_build_assign (temp, var));
     }
   else