2010-06-29 Richard Guenther <rguenther@suse.de>

	PR middle-end/44667
	* tree-inline.c (initialize_inlined_parameters): Make sure
	to remap the inlined parameter variable substitutions types.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161527 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7eeef8d..2a64529 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-29  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/44667
+       * tree-inline.c (initialize_inlined_parameters): Make sure
+       to remap the inlined parameter variable substitutions types.
+
 2010-06-29  Eric Botcazou  <ebotcazou@adacore.com>
 
        PR rtl-optimization/44659

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index a419c26..2604c6b 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -2642,6 +2642,32 @@ initialize_inlined_parameters (copy_body_data *id, gimple stmt,
       val = i < gimple_call_num_args (stmt) ? gimple_call_arg (stmt, i) : NULL;
       setup_one_parameter (id, p, val, fn, bb, &vars);
     }
+  /* After remapping parameters remap their types.  This has to be done
+     in a second loop over all parameters to appropriately remap
+     variable sized arrays when the size is specified in a
+     parameter following the array.  */
+  for (p = parms, i = 0; p; p = TREE_CHAIN (p), i++)
+    {
+      tree *varp = (tree *) pointer_map_contains (id->decl_map, p);
+      if (varp
+         && TREE_CODE (*varp) == VAR_DECL)
+       {
+         tree def = (gimple_in_ssa_p (cfun)
+                     ? gimple_default_def (id->src_cfun, p) : NULL);
+         TREE_TYPE (*varp) = remap_type (TREE_TYPE (*varp), id);
+         /* Also remap the default definition if it was remapped
+            to the default definition of the parameter replacement
+            by the parameter setup.  */
+         if (def && gimple_in_ssa_p (cfun) && is_gimple_reg (p))
+           {
+             tree *defp = (tree *) pointer_map_contains (id->decl_map, def);
+             if (defp
+                 && TREE_CODE (*defp) == SSA_NAME
+                 && SSA_NAME_VAR (*defp) == *varp)
+               TREE_TYPE (*defp) = TREE_TYPE (*varp);
+           }
+       }
+    }
 
   /* Initialize the static chain.  */
   p = DECL_STRUCT_FUNCTION (fn)->static_chain_decl;