* Makefile.in (cgraphbuild.o): Add dependency on ipa-utils.h

	* cgraphbuild.c: Include ipa-utils.h
	(record_reference_ctx): New struct.
	(record_reference): Simplify to work on initializers; not statements.
	(mark_address, mark_load, mark_store): New.
	(build_cgraph_edges): Simplify using walk_stmt_load_store_addr_ops;
	walk PHI nodes too.
	(record_references_in_initializer): Update use of record_reference.
	(rebuild_cgraph_edges): Simplify using walk_stmt_load_store_addr_ops;
	walk PHI nodes too.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb76cf6..b792a53 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,18 @@
 2010-05-04  Jan Hubicka  <jh@suse.cz>
 
+       * Makefile.in (cgraphbuild.o): Add dependency on ipa-utils.h
+       * cgraphbuild.c: Include ipa-utils.h
+       (record_reference_ctx): New struct.
+       (record_reference): Simplify to work on initializers; not statements.
+       (mark_address, mark_load, mark_store): New.
+       (build_cgraph_edges): Simplify using walk_stmt_load_store_addr_ops;
+       walk PHI nodes too.
+       (record_references_in_initializer): Update use of record_reference.
+       (rebuild_cgraph_edges): Simplify using walk_stmt_load_store_addr_ops;
+       walk PHI nodes too.
+
+2010-05-04  Jan Hubicka  <jh@suse.cz>
+
        * lto-symtab.c (lto_cgraph_replace_node): Do not remove edges;
        node will be removed anyway.
        (lto_varpool_replace_node): Allow also unanalyzed nodes;

diff --git a/gcc/cgraphbuild.c b/gcc/cgraphbuild.c
index c63b5af..02c373a 100644 (file)
--- a/gcc/cgraphbuild.c
+++ b/gcc/cgraphbuild.c
@@ -32,13 +32,11 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple.h"
 #include "tree-pass.h"
 #include "ipa-utils.h"
-#include "except.h"
 
 /* Context of record_reference.  */
 struct record_reference_ctx
 {
   bool only_vars;
-  struct varpool_node *varpool_node;
 };
 
 /* Walk tree and record all calls and references to functions/variables.
@@ -65,26 +63,15 @@ record_reference (tree *tp, int *walk_subtrees, void *data)
       /* Record dereferences to the functions.  This makes the
         functions reachable unconditionally.  */
       decl = get_base_var (*tp);
-      if (TREE_CODE (decl) == FUNCTION_DECL)
-       {
-         if (!ctx->only_vars)
-         cgraph_mark_address_taken_node (cgraph_node (decl));
-         ipa_record_reference (NULL, ctx->varpool_node,
-                               cgraph_node (decl), NULL,
-                               IPA_REF_ADDR, NULL);
-       }
+      if (TREE_CODE (decl) == FUNCTION_DECL && !ctx->only_vars)
+       cgraph_mark_address_taken_node (cgraph_node (decl));
 
       if (TREE_CODE (decl) == VAR_DECL)
        {
-         struct varpool_node *vnode = varpool_node (decl);
+         gcc_assert (TREE_STATIC (decl) || DECL_EXTERNAL (decl));
          if (lang_hooks.callgraph.analyze_expr)
            lang_hooks.callgraph.analyze_expr (&decl, walk_subtrees);
-         varpool_mark_needed_node (vnode);
-         if (vnode->alias && vnode->extra_name)
-           vnode = vnode->extra_name;
-         ipa_record_reference (NULL, ctx->varpool_node,
-                               NULL, vnode,
-                               IPA_REF_ADDR, NULL);
+         varpool_mark_needed_node (varpool_node (decl));
        }
       *walk_subtrees = 0;
       break;
@@ -106,86 +93,6 @@ record_reference (tree *tp, int *walk_subtrees, void *data)
   return NULL_TREE;
 }
 
-/* Record references to typeinfos in the type list LIST.  */
-
-static void
-record_type_list (struct cgraph_node *node, tree list)
-{
-  for (; list; list = TREE_CHAIN (list))
-    {
-      tree type = TREE_VALUE (list);
-      
-      if (TYPE_P (type))
-       type = lookup_type_for_runtime (type);
-      STRIP_NOPS (type);
-      if (TREE_CODE (type) == ADDR_EXPR)
-       {
-         type = TREE_OPERAND (type, 0);
-         if (TREE_CODE (type) == VAR_DECL)
-           {
-             struct varpool_node *vnode = varpool_node (type);
-             varpool_mark_needed_node (vnode);
-             ipa_record_reference (node, NULL,
-                                   NULL, vnode,
-                                   IPA_REF_ADDR, NULL);
-           }
-       }
-    }
-}
-
-/* Record all references we will introduce by producing EH tables
-   for NODE.  */
-
-static void
-record_eh_tables (struct cgraph_node *node, struct function *fun)
-{
-  eh_region i;
-
-  i = fun->eh->region_tree;
-  if (!i)
-    return;
-
-  while (1)
-    {
-      switch (i->type)
-       {
-       case ERT_CLEANUP:
-       case ERT_MUST_NOT_THROW:
-         break;
-
-       case ERT_TRY:
-         {
-           eh_catch c;
-           for (c = i->u.eh_try.first_catch; c; c = c->next_catch)
-             record_type_list (node, c->type_list);
-         }
-         break;
-
-       case ERT_ALLOWED_EXCEPTIONS:
-         record_type_list (node, i->u.allowed.type_list);
-         break;
-       }
-      /* If there are sub-regions, process them.  */
-      if (i->inner)
-       i = i->inner;
-      /* If there are peers, process them.  */
-      else if (i->next_peer)
-       i = i->next_peer;
-      /* Otherwise, step back up the tree to the next peer.  */
-      else
-       {
-         do
-           {
-             i = i->outer;
-             if (i == NULL)
-               return;
-           }
-         while (i->next_peer == NULL);
-         i = i->next_peer;
-       }
-    }
-}
-
 /* Reset inlining information of all incoming call edges of NODE.  */
 
 void
@@ -241,9 +148,6 @@ mark_address (gimple stmt ATTRIBUTE_UNUSED, tree addr,
     {
       struct cgraph_node *node = cgraph_node (addr);
       cgraph_mark_address_taken_node (node);
-      ipa_record_reference ((struct cgraph_node *)data, NULL,
-                           node, NULL,
-                           IPA_REF_ADDR, stmt);
     }
   else
     {
@@ -257,11 +161,6 @@ mark_address (gimple stmt ATTRIBUTE_UNUSED, tree addr,
          if (lang_hooks.callgraph.analyze_expr)
            lang_hooks.callgraph.analyze_expr (&addr, &walk_subtrees);
          varpool_mark_needed_node (vnode);
-         if (vnode->alias && vnode->extra_name)
-           vnode = vnode->extra_name;
-         ipa_record_reference ((struct cgraph_node *)data, NULL,
-                               NULL, vnode,
-                               IPA_REF_ADDR, stmt);
        }
     }
 
@@ -284,11 +183,6 @@ mark_load (gimple stmt ATTRIBUTE_UNUSED, tree t,
       if (lang_hooks.callgraph.analyze_expr)
        lang_hooks.callgraph.analyze_expr (&t, &walk_subtrees);
       varpool_mark_needed_node (vnode);
-      if (vnode->alias && vnode->extra_name)
-       vnode = vnode->extra_name;
-      ipa_record_reference ((struct cgraph_node *)data, NULL,
-                           NULL, vnode,
-                           IPA_REF_LOAD, stmt);
     }
   return false;
 }
@@ -309,11 +203,6 @@ mark_store (gimple stmt ATTRIBUTE_UNUSED, tree t,
       if (lang_hooks.callgraph.analyze_expr)
        lang_hooks.callgraph.analyze_expr (&t, &walk_subtrees);
       varpool_mark_needed_node (vnode);
-      if (vnode->alias && vnode->extra_name)
-       vnode = vnode->extra_name;
-      ipa_record_reference ((struct cgraph_node *)data, NULL,
-                           NULL, vnode,
-                           IPA_REF_STORE, NULL);
      }
   return false;
 }
@@ -339,21 +228,12 @@ build_cgraph_edges (void)
          gimple stmt = gsi_stmt (gsi);
          tree decl;
 
-         if (is_gimple_call (stmt))
-           {
-             int freq = compute_call_stmt_bb_frequency (current_function_decl,
-                                                        bb);
-             decl = gimple_call_fndecl (stmt);
-             if (decl)
-               cgraph_create_edge (node, cgraph_node (decl), stmt,
-                                   bb->count, freq,
-                                   bb->loop_depth);
-             else
-               cgraph_create_indirect_edge (node, stmt,
-                                            gimple_call_flags (stmt),
-                                            bb->count, freq,
-                                            bb->loop_depth);
-           }
+         if (is_gimple_call (stmt) && (decl = gimple_call_fndecl (stmt)))
+           cgraph_create_edge (node, cgraph_node (decl), stmt,
+                               bb->count,
+                               compute_call_stmt_bb_frequency
+                                 (current_function_decl, bb),
+                               bb->loop_depth);
          walk_stmt_load_store_addr_ops (stmt, node, mark_load,
                                         mark_store, mark_address);
          if (gimple_code (stmt) == GIMPLE_OMP_PARALLEL
@@ -387,7 +267,6 @@ build_cgraph_edges (void)
          && (TREE_STATIC (decl) && !DECL_EXTERNAL (decl)))
        varpool_finalize_decl (decl);
     }
-  record_eh_tables (node, cfun);
 
   pointer_set_destroy (visited_nodes);
   return 0;
@@ -420,10 +299,8 @@ void
 record_references_in_initializer (tree decl, bool only_vars)
 {
   struct pointer_set_t *visited_nodes = pointer_set_create ();
-  struct varpool_node *node = varpool_node (decl);
-  struct record_reference_ctx ctx = {false, NULL};
+  struct record_reference_ctx ctx = {false};
 
-  ctx.varpool_node = node;
   ctx.only_vars = only_vars;
   walk_tree (&DECL_INITIAL (decl), record_reference,
              &ctx, visited_nodes);
@@ -441,7 +318,6 @@ rebuild_cgraph_edges (void)
   gimple_stmt_iterator gsi;
 
   cgraph_node_remove_callees (node);
-  ipa_remove_all_references (&node->ref_list);
 
   node->count = ENTRY_BLOCK_PTR->count;
 
@@ -452,21 +328,12 @@ rebuild_cgraph_edges (void)
          gimple stmt = gsi_stmt (gsi);
          tree decl;
 
-         if (is_gimple_call (stmt))
-           {
-             int freq = compute_call_stmt_bb_frequency (current_function_decl,
-                                                        bb);
-             decl = gimple_call_fndecl (stmt);
-             if (decl)
-               cgraph_create_edge (node, cgraph_node (decl), stmt,
-                                   bb->count, freq,
-                                   bb->loop_depth);
-             else
-               cgraph_create_indirect_edge (node, stmt,
-                                            gimple_call_flags (stmt),
-                                            bb->count, freq,
-                                            bb->loop_depth);
-           }
+         if (is_gimple_call (stmt) && (decl = gimple_call_fndecl (stmt)))
+           cgraph_create_edge (node, cgraph_node (decl), stmt,
+                               bb->count,
+                               compute_call_stmt_bb_frequency
+                                 (current_function_decl, bb),
+                               bb->loop_depth);
          walk_stmt_load_store_addr_ops (stmt, node, mark_load,
                                         mark_store, mark_address);
 
@@ -475,43 +342,11 @@ rebuild_cgraph_edges (void)
        walk_stmt_load_store_addr_ops (gsi_stmt (gsi), node,
                                       mark_load, mark_store, mark_address);
     }
-  record_eh_tables (node, cfun);
   gcc_assert (!node->global.inlined_to);
 
   return 0;
 }
 
-/* Rebuild cgraph edges for current function node.  This needs to be run after
-   passes that don't update the cgraph.  */
-
-void
-cgraph_rebuild_references (void)
-{
-  basic_block bb;
-  struct cgraph_node *node = cgraph_node (current_function_decl);
-  gimple_stmt_iterator gsi;
-
-  ipa_remove_all_references (&node->ref_list);
-
-  node->count = ENTRY_BLOCK_PTR->count;
-
-  FOR_EACH_BB (bb)
-    {
-      for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
-       {
-         gimple stmt = gsi_stmt (gsi);
-
-         walk_stmt_load_store_addr_ops (stmt, node, mark_load,
-                                        mark_store, mark_address);
-
-       }
-      for (gsi = gsi_start (phi_nodes (bb)); !gsi_end_p (gsi); gsi_next (&gsi))
-       walk_stmt_load_store_addr_ops (gsi_stmt (gsi), node,
-                                      mark_load, mark_store, mark_address);
-    }
-  record_eh_tables (node, cfun);
-}
-
 struct gimple_opt_pass pass_rebuild_cgraph_edges =
 {
  {