libcpp/ChangeLog:

[pf3gnuchains/gcc-fork.git] / gcc / tree-inline.c

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index feb395f..39dde67 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -46,7 +46,7 @@ Boston, MA 02111-1307, USA.  */
 /* I'm not real happy about this, but we need to handle gimple and
    non-gimple trees.  */
 #include "tree-iterator.h"
-#include "tree-simple.h"
+#include "tree-gimple.h"
 
 /* 0 if we should not perform inlining.
    1 if we should expand functions calls inline at the tree level.
@@ -394,7 +394,7 @@ remap_block (tree *block, inline_data *id)
     /* We're building a clone; DECL_INITIAL is still
        error_mark_node, and current_binding_level is the parm
        binding level.  */
-    (*lang_hooks.decls.insert_block) (new_block);
+    lang_hooks.decls.insert_block (new_block);
   else
     {
       /* Attach this new block after the DECL_INITIAL block for the
@@ -779,7 +779,7 @@ setup_one_parameter (inline_data *id, tree p, tree value,
      the argument to the proper type in case it was promoted.  */
   if (value)
     {
-      tree rhs = convert (TREE_TYPE (var), value);
+      tree rhs = fold_convert (TREE_TYPE (var), value);
 
       if (rhs == error_mark_node)
        return;
@@ -1324,6 +1324,7 @@ estimate_num_insns_1 (tree *tp, int *walk_subtrees, void *data)
     case UNGT_EXPR:
     case UNGE_EXPR:
     case UNEQ_EXPR:
+    case LTGT_EXPR:
 
     case CONVERT_EXPR:
 
@@ -1342,7 +1343,7 @@ estimate_num_insns_1 (tree *tp, int *walk_subtrees, void *data)
       *count++;
       break;
 
-    /* Few special cases of expensive operations.  This is usefull
+    /* Few special cases of expensive operations.  This is useful
        to avoid inlining on functions having too many of these.  */
     case TRUNC_DIV_EXPR:
     case CEIL_DIV_EXPR:
@@ -1930,7 +1931,7 @@ save_body (tree fn, tree *arg_copy)
   for (parg = arg_copy; *parg; parg = &TREE_CHAIN (*parg))
     {
       tree new = copy_node (*parg);
-      (*lang_hooks.dup_lang_specific_decl) (new);
+      lang_hooks.dup_lang_specific_decl (new);
       DECL_ABSTRACT_ORIGIN (new) = DECL_ORIGIN (*parg);
       insert_decl_map (&id, *parg, new);
       TREE_CHAIN (new) = TREE_CHAIN (*parg);
@@ -2017,8 +2018,8 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, void *htab_)
        return NULL_TREE;
     }
 
-  result = (*lang_hooks.tree_inlining.walk_subtrees) (tp, &walk_subtrees, func,
-                                                     data, htab);
+  result = lang_hooks.tree_inlining.walk_subtrees (tp, &walk_subtrees, func,
+                                                  data, htab);
   if (result || ! walk_subtrees)
     return result;
 
@@ -2056,7 +2057,7 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, void *htab_)
        }
 #endif
 
-      if ((*lang_hooks.tree_inlining.tree_chain_matters_p) (*tp))
+      if (lang_hooks.tree_inlining.tree_chain_matters_p (*tp))
        /* Check our siblings.  */
        WALK_SUBTREE_TAIL (TREE_CHAIN (*tp));
     }