2008-04-28 Richard Guenther <rguenther@suse.de>

[pf3gnuchains/gcc-fork.git] / gcc / ipa-cp.c

diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index f2e9773..4d9e0a4 100644 (file)
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -1,12 +1,12 @@
 /* Interprocedural constant propagation
 /* Interprocedural constant propagation

-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.

    Contributed by Razya Ladelsky <RAZYA@il.ibm.com>
    
 This file is part of GCC.
    
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
    Contributed by Razya Ladelsky <RAZYA@il.ibm.com>
    
 This file is part of GCC.
    
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
    
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
    
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,9 +15,8 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
    
 You should have received a copy of the GNU General Public License
 for more details.
    
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 /* Interprocedural constant propagation.
    The aim of interprocedural constant propagation (IPCP) is to find which 
 
 /* Interprocedural constant propagation.
    The aim of interprocedural constant propagation (IPCP) is to find which 


@@ -65,7 +64,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
    arguments
    of the callsite. There are three types of values :
    Formal - the caller's formal parameter is passed as an actual argument.
    arguments
    of the callsite. There are three types of values :
    Formal - the caller's formal parameter is passed as an actual argument.

-   Constant - a constant is passed as a an actual argument.
+   Constant - a constant is passed as an actual argument.

    Unknown - neither of the above.
    
    In order to compute the jump functions, we need the modify information for 
    Unknown - neither of the above.
    
    In order to compute the jump functions, we need the modify information for 


@@ -445,7 +444,7 @@ constant_val_insert (tree parm1, tree val)
   tree init_stmt = NULL;
   edge e_step;
 
   tree init_stmt = NULL;
   edge e_step;
 

-  init_stmt = build2 (GIMPLE_MODIFY_STMT, void_type_node, parm1, val);
+  init_stmt = build_gimple_modify_stmt (parm1, val);

 
   if (init_stmt)
     {
 
   if (init_stmt)
     {


@@ -570,7 +569,7 @@ static void
 ipcp_propagate_stage (void)
 {
   int i;
 ipcp_propagate_stage (void)
 {
   int i;

-  struct ipcp_formal cval1 = { 0, {0} }, cval = { 0,{0} };
+  struct ipcp_formal cval1 = { BOTTOM, {0} }, cval = { BOTTOM, {0} };

   struct ipcp_formal *cval2;
   struct cgraph_node *mt, *callee;
   struct cgraph_edge *cs;
   struct ipcp_formal *cval2;
   struct cgraph_node *mt, *callee;
   struct cgraph_edge *cs;


@@ -792,7 +791,7 @@ ipcp_profile_bb_print (FILE * f)
            ENTRY_BLOCK_PTR_FOR_FUNCTION (DECL_STRUCT_FUNCTION (node->decl));
          fprintf (f, "ENTRY: Count");
          fprintf (f, " " HOST_WIDE_INT_PRINT_DEC
            ENTRY_BLOCK_PTR_FOR_FUNCTION (DECL_STRUCT_FUNCTION (node->decl));
          fprintf (f, "ENTRY: Count");
          fprintf (f, " " HOST_WIDE_INT_PRINT_DEC

-                  " Frquency  %d\n", (HOST_WIDE_INT) bb->count,
+                  " Frequency  %d\n", (HOST_WIDE_INT) bb->count,

                   bb->frequency);
 
          FOR_EACH_BB_FN (bb, DECL_STRUCT_FUNCTION (node->decl))
                   bb->frequency);
 
          FOR_EACH_BB_FN (bb, DECL_STRUCT_FUNCTION (node->decl))


@@ -925,8 +924,8 @@ ipcp_update_callgraph (void)
            if (ipcp_redirect (cs))
              {
                cgraph_redirect_edge_callee (cs, orig_callee);
            if (ipcp_redirect (cs))
              {
                cgraph_redirect_edge_callee (cs, orig_callee);

-               TREE_OPERAND (TREE_OPERAND
-                             (get_call_expr_in (cs->call_stmt), 0), 0) =
+               TREE_OPERAND (CALL_EXPR_FN (get_call_expr_in (cs->call_stmt)),
+                             0) =

                  orig_callee->decl;
              }
          }
                  orig_callee->decl;
              }
          }


@@ -1137,7 +1136,10 @@ cgraph_gate_cp (void)
   return flag_ipa_cp;
 }
 
   return flag_ipa_cp;
 }
 

-struct tree_opt_pass pass_ipa_cp = {
+struct simple_ipa_opt_pass pass_ipa_cp = 
+{
+ {
+  SIMPLE_IPA_PASS,

   "cp",                                /* name */
   cgraph_gate_cp,              /* gate */
   ipcp_driver,                 /* execute */
   "cp",                                /* name */
   cgraph_gate_cp,              /* gate */
   ipcp_driver,                 /* execute */


@@ -1149,6 +1151,6 @@ struct tree_opt_pass pass_ipa_cp = {
   PROP_trees,                  /* properties_provided */
   0,                           /* properties_destroyed */
   0,                           /* todo_flags_start */
   PROP_trees,                  /* properties_provided */
   0,                           /* properties_destroyed */
   0,                           /* todo_flags_start */

-  TODO_dump_cgraph | TODO_dump_func,   /* todo_flags_finish */
-  0                            /* letter */
+  TODO_dump_cgraph | TODO_dump_func    /* todo_flags_finish */
+ }

 };
 };