PR c++/68795: fix uninitialized close_paren_loc in cp_parser_postfix_expression
[gcc.git] / gcc / cgraph.c
index 586ef797abae40069827e7d9f2f0afb3a9986a21..0d70904b5e8ceac49eeb966d23010e09827a8285 100644 (file)
@@ -1,5 +1,5 @@
 /* Callgraph handling code.
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 Free Software Foundation, Inc.
    Contributed by Jan Hubicka
 
 This file is part of GCC.
@@ -26,70 +26,49 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "target.h"
+#include "rtl.h"
 #include "tree.h"
+#include "gimple.h"
+#include "predict.h"
+#include "alloc-pool.h"
+#include "gimple-ssa.h"
+#include "cgraph.h"
+#include "lto-streamer.h"
+#include "fold-const.h"
 #include "varasm.h"
 #include "calls.h"
 #include "print-tree.h"
-#include "tree-inline.h"
 #include "langhooks.h"
-#include "hashtab.h"
-#include "toplev.h"
-#include "flags.h"
-#include "debug.h"
-#include "target.h"
-#include "cgraph.h"
 #include "intl.h"
-#include "tree-ssa-alias.h"
-#include "internal-fn.h"
 #include "tree-eh.h"
-#include "gimple-expr.h"
-#include "gimple.h"
 #include "gimple-iterator.h"
-#include "timevar.h"
-#include "dumpfile.h"
-#include "gimple-ssa.h"
-#include "cgraph.h"
 #include "tree-cfg.h"
 #include "tree-ssa.h"
 #include "value-prof.h"
-#include "except.h"
-#include "diagnostic-core.h"
-#include "rtl.h"
 #include "ipa-utils.h"
-#include "lto-streamer.h"
+#include "symbol-summary.h"
+#include "ipa-prop.h"
 #include "ipa-inline.h"
 #include "cfgloop.h"
 #include "gimple-pretty-print.h"
+#include "tree-dfa.h"
+#include "profile.h"
+#include "params.h"
+#include "tree-chkp.h"
+#include "context.h"
+#include "gimplify.h"
 
 /* FIXME: Only for PROP_loops, but cgraph shouldn't have to know about this.  */
 #include "tree-pass.h"
 
-static void cgraph_node_remove_callers (struct cgraph_node *node);
-static inline void cgraph_edge_remove_caller (struct cgraph_edge *e);
-static inline void cgraph_edge_remove_callee (struct cgraph_edge *e);
-
 /* Queue of cgraph nodes scheduled to be lowered.  */
 symtab_node *x_cgraph_nodes_queue;
-#define cgraph_nodes_queue ((struct cgraph_node *)x_cgraph_nodes_queue)
+#define cgraph_nodes_queue ((cgraph_node *)x_cgraph_nodes_queue)
 
-/* Number of nodes in existence.  */
-int cgraph_n_nodes;
-
-/* Maximal uid used in cgraph nodes.  */
-int cgraph_max_uid;
-
-/* Maximal uid used in cgraph edges.  */
-int cgraph_edge_max_uid;
-
-/* Set when whole unit has been analyzed so we can access global info.  */
-bool cgraph_global_info_ready = false;
-
-/* What state callgraph is in right now.  */
-enum cgraph_state cgraph_state = CGRAPH_STATE_PARSING;
-
-/* Set when the cgraph is fully build and the basic flags are computed.  */
-bool cgraph_function_flags_ready = false;
+/* Symbol table global context.  */
+symbol_table *symtab;
 
 /* List of hooks triggered on cgraph_edge events.  */
 struct cgraph_edge_hook_list {
@@ -119,51 +98,34 @@ struct cgraph_2node_hook_list {
   struct cgraph_2node_hook_list *next;
 };
 
-/* List of hooks triggered when an edge is removed.  */
-struct cgraph_edge_hook_list *first_cgraph_edge_removal_hook;
-/* List of hooks triggered when a node is removed.  */
-struct cgraph_node_hook_list *first_cgraph_node_removal_hook;
-/* List of hooks triggered when an edge is duplicated.  */
-struct cgraph_2edge_hook_list *first_cgraph_edge_duplicated_hook;
-/* List of hooks triggered when a node is duplicated.  */
-struct cgraph_2node_hook_list *first_cgraph_node_duplicated_hook;
-/* List of hooks triggered when an function is inserted.  */
-struct cgraph_node_hook_list *first_cgraph_function_insertion_hook;
-
-/* Head of a linked list of unused (freed) call graph nodes.
-   Do not GTY((delete)) this list so UIDs gets reliably recycled.  */
-static GTY(()) struct cgraph_node *free_nodes;
-/* Head of a linked list of unused (freed) call graph edges.
-   Do not GTY((delete)) this list so UIDs gets reliably recycled.  */
-static GTY(()) struct cgraph_edge *free_edges;
-
-/* Did procss_same_body_aliases run?  */
-bool cpp_implicit_aliases_done;
+/* Hash descriptor for cgraph_function_version_info.  */
+
+struct function_version_hasher : ggc_ptr_hash<cgraph_function_version_info>
+{
+  static hashval_t hash (cgraph_function_version_info *);
+  static bool equal (cgraph_function_version_info *,
+                    cgraph_function_version_info *);
+};
 
 /* Map a cgraph_node to cgraph_function_version_info using this htab.
    The cgraph_function_version_info has a THIS_NODE field that is the
    corresponding cgraph_node..  */
 
-static GTY((param_is (struct cgraph_function_version_info))) htab_t
-  cgraph_fnver_htab = NULL;
+static GTY(()) hash_table<function_version_hasher> *cgraph_fnver_htab = NULL;
 
 /* Hash function for cgraph_fnver_htab.  */
-static hashval_t
-cgraph_fnver_htab_hash (const void *ptr)
+hashval_t
+function_version_hasher::hash (cgraph_function_version_info *ptr)
 {
-  int uid = ((const struct cgraph_function_version_info *)ptr)->this_node->uid;
+  int uid = ptr->this_node->uid;
   return (hashval_t)(uid);
 }
 
 /* eq function for cgraph_fnver_htab.  */
-static int
-cgraph_fnver_htab_eq (const void *p1, const void *p2)
+bool
+function_version_hasher::equal (cgraph_function_version_info *n1,
+                               cgraph_function_version_info *n2)
 {
-  const struct cgraph_function_version_info *n1
-    = (const struct cgraph_function_version_info *)p1;
-  const struct cgraph_function_version_info *n2
-    = (const struct cgraph_function_version_info *)p2;
-
   return n1->this_node->uid == n2->this_node->uid;
 }
 
@@ -171,56 +133,71 @@ cgraph_fnver_htab_eq (const void *p1, const void *p2)
 static GTY(()) struct cgraph_function_version_info *
   version_info_node = NULL;
 
+/* Return true if NODE's address can be compared.  */
+
+bool
+symtab_node::address_can_be_compared_p ()
+{
+  /* Address of virtual tables and functions is never compared.  */
+  if (DECL_VIRTUAL_P (decl))
+    return false;
+  /* Address of C++ cdtors is never compared.  */
+  if (is_a <cgraph_node *> (this)
+      && (DECL_CXX_CONSTRUCTOR_P (decl)
+         || DECL_CXX_DESTRUCTOR_P (decl)))
+    return false;
+  /* Constant pool symbols addresses are never compared.
+     flag_merge_constants permits us to assume the same on readonly vars.  */
+  if (is_a <varpool_node *> (this)
+      && (DECL_IN_CONSTANT_POOL (decl)
+         || (flag_merge_constants >= 2
+             && TREE_READONLY (decl) && !TREE_THIS_VOLATILE (decl))))
+    return false;
+  return true;
+}
+
 /* Get the cgraph_function_version_info node corresponding to node.  */
-struct cgraph_function_version_info *
-get_cgraph_node_version (struct cgraph_node *node)
+cgraph_function_version_info *
+cgraph_node::function_version (void)
 {
-  struct cgraph_function_version_info *ret;
-  struct cgraph_function_version_info key;
-  key.this_node = node;
+  cgraph_function_version_info key;
+  key.this_node = this;
 
   if (cgraph_fnver_htab == NULL)
     return NULL;
 
-  ret = (struct cgraph_function_version_info *)
-    htab_find (cgraph_fnver_htab, &key);
-
-  return ret;
+  return cgraph_fnver_htab->find (&key);
 }
 
 /* Insert a new cgraph_function_version_info node into cgraph_fnver_htab
    corresponding to cgraph_node NODE.  */
-struct cgraph_function_version_info *
-insert_new_cgraph_node_version (struct cgraph_node *node)
+cgraph_function_version_info *
+cgraph_node::insert_new_function_version (void)
 {
-  void **slot;
-  
   version_info_node = NULL;
-  version_info_node = ggc_alloc_cleared_cgraph_function_version_info ();
-  version_info_node->this_node = node;
+  version_info_node = ggc_cleared_alloc<cgraph_function_version_info> ();
+  version_info_node->this_node = this;
 
   if (cgraph_fnver_htab == NULL)
-    cgraph_fnver_htab = htab_create_ggc (2, cgraph_fnver_htab_hash,
-                                        cgraph_fnver_htab_eq, NULL);
+    cgraph_fnver_htab = hash_table<function_version_hasher>::create_ggc (2);
 
-  slot = htab_find_slot (cgraph_fnver_htab, version_info_node, INSERT);
-  gcc_assert (slot != NULL);
-  *slot = version_info_node;
+  *cgraph_fnver_htab->find_slot (version_info_node, INSERT)
+    = version_info_node;
   return version_info_node;
 }
 
 /* Remove the cgraph_function_version_info and cgraph_node for DECL.  This
    DECL is a duplicate declaration.  */
 void
-delete_function_version (tree decl)
+cgraph_node::delete_function_version (tree decl)
 {
-  struct cgraph_node *decl_node = cgraph_get_node (decl);
-  struct cgraph_function_version_info *decl_v = NULL;
+  cgraph_node *decl_node = cgraph_node::get (decl);
+  cgraph_function_version_info *decl_v = NULL;
 
   if (decl_node == NULL)
     return;
 
-  decl_v = get_cgraph_node_version (decl_node);
+  decl_v = decl_node->function_version ();
 
   if (decl_v == NULL)
     return;
@@ -232,35 +209,35 @@ delete_function_version (tree decl)
     decl_v->next->prev = decl_v->prev;
 
   if (cgraph_fnver_htab != NULL)
-    htab_remove_elt (cgraph_fnver_htab, decl_v);
+    cgraph_fnver_htab->remove_elt (decl_v);
 
-  cgraph_remove_node (decl_node);
+  decl_node->remove ();
 }
 
 /* Record that DECL1 and DECL2 are semantically identical function
    versions.  */
 void
-record_function_versions (tree decl1, tree decl2)
+cgraph_node::record_function_versions (tree decl1, tree decl2)
 {
-  struct cgraph_node *decl1_node = cgraph_get_create_node (decl1);
-  struct cgraph_node *decl2_node = cgraph_get_create_node (decl2);
-  struct cgraph_function_version_info *decl1_v = NULL;
-  struct cgraph_function_version_info *decl2_v = NULL;
-  struct cgraph_function_version_info *before;
-  struct cgraph_function_version_info *after;
+  cgraph_node *decl1_node = cgraph_node::get_create (decl1);
+  cgraph_node *decl2_node = cgraph_node::get_create (decl2);
+  cgraph_function_version_info *decl1_v = NULL;
+  cgraph_function_version_info *decl2_v = NULL;
+  cgraph_function_version_info *before;
+  cgraph_function_version_info *after;
 
   gcc_assert (decl1_node != NULL && decl2_node != NULL);
-  decl1_v = get_cgraph_node_version (decl1_node);
-  decl2_v = get_cgraph_node_version (decl2_node);
+  decl1_v = decl1_node->function_version ();
+  decl2_v = decl2_node->function_version ();
 
   if (decl1_v != NULL && decl2_v != NULL)
     return;
 
   if (decl1_v == NULL)
-    decl1_v = insert_new_cgraph_node_version (decl1_node);
+    decl1_v = decl1_node->insert_new_function_version ();
 
   if (decl2_v == NULL)
-    decl2_v = insert_new_cgraph_node_version (decl2_node);
+    decl2_v = decl2_node->insert_new_function_version ();
 
   /* Chain decl2_v and decl1_v.  All semantically identical versions
      will be chained together.  */
@@ -278,20 +255,38 @@ record_function_versions (tree decl1, tree decl2)
   after->prev = before;
 }
 
-/* Macros to access the next item in the list of free cgraph nodes and
-   edges. */
-#define NEXT_FREE_NODE(NODE) cgraph ((NODE)->next)
-#define SET_NEXT_FREE_NODE(NODE,NODE2) ((NODE))->next = NODE2
-#define NEXT_FREE_EDGE(EDGE) (EDGE)->prev_caller
+/* Initialize callgraph dump file.  */
+
+void
+symbol_table::initialize (void)
+{
+  if (!dump_file)
+    dump_file = dump_begin (TDI_cgraph, NULL);
+}
+
+/* Allocate new callgraph node and insert it into basic data structures.  */
+
+cgraph_node *
+symbol_table::create_empty (void)
+{
+  cgraph_node *node = allocate_cgraph_symbol ();
+
+  node->type = SYMTAB_FUNCTION;
+  node->frequency = NODE_FREQUENCY_NORMAL;
+  node->count_materialization_scale = REG_BR_PROB_BASE;
+  cgraph_count++;
+
+  return node;
+}
 
 /* Register HOOK to be called with DATA on each removed edge.  */
-struct cgraph_edge_hook_list *
-cgraph_add_edge_removal_hook (cgraph_edge_hook hook, void *data)
+cgraph_edge_hook_list *
+symbol_table::add_edge_removal_hook (cgraph_edge_hook hook, void *data)
 {
-  struct cgraph_edge_hook_list *entry;
-  struct cgraph_edge_hook_list **ptr = &first_cgraph_edge_removal_hook;
+  cgraph_edge_hook_list *entry;
+  cgraph_edge_hook_list **ptr = &m_first_edge_removal_hook;
 
-  entry = (struct cgraph_edge_hook_list *) xmalloc (sizeof (*entry));
+  entry = (cgraph_edge_hook_list *) xmalloc (sizeof (*entry));
   entry->hook = hook;
   entry->data = data;
   entry->next = NULL;
@@ -303,9 +298,9 @@ cgraph_add_edge_removal_hook (cgraph_edge_hook hook, void *data)
 
 /* Remove ENTRY from the list of hooks called on removing edges.  */
 void
-cgraph_remove_edge_removal_hook (struct cgraph_edge_hook_list *entry)
+symbol_table::remove_edge_removal_hook (cgraph_edge_hook_list *entry)
 {
-  struct cgraph_edge_hook_list **ptr = &first_cgraph_edge_removal_hook;
+  cgraph_edge_hook_list **ptr = &m_first_edge_removal_hook;
 
   while (*ptr != entry)
     ptr = &(*ptr)->next;
@@ -314,10 +309,10 @@ cgraph_remove_edge_removal_hook (struct cgraph_edge_hook_list *entry)
 }
 
 /* Call all edge removal hooks.  */
-static void
-cgraph_call_edge_removal_hooks (struct cgraph_edge *e)
+void
+symbol_table::call_edge_removal_hooks (cgraph_edge *e)
 {
-  struct cgraph_edge_hook_list *entry = first_cgraph_edge_removal_hook;
+  cgraph_edge_hook_list *entry = m_first_edge_removal_hook;
   while (entry)
   {
     entry->hook (e, entry->data);
@@ -326,13 +321,13 @@ cgraph_call_edge_removal_hooks (struct cgraph_edge *e)
 }
 
 /* Register HOOK to be called with DATA on each removed node.  */
-struct cgraph_node_hook_list *
-cgraph_add_node_removal_hook (cgraph_node_hook hook, void *data)
+cgraph_node_hook_list *
+symbol_table::add_cgraph_removal_hook (cgraph_node_hook hook, void *data)
 {
-  struct cgraph_node_hook_list *entry;
-  struct cgraph_node_hook_list **ptr = &first_cgraph_node_removal_hook;
+  cgraph_node_hook_list *entry;
+  cgraph_node_hook_list **ptr = &m_first_cgraph_removal_hook;
 
-  entry = (struct cgraph_node_hook_list *) xmalloc (sizeof (*entry));
+  entry = (cgraph_node_hook_list *) xmalloc (sizeof (*entry));
   entry->hook = hook;
   entry->data = data;
   entry->next = NULL;
@@ -344,9 +339,9 @@ cgraph_add_node_removal_hook (cgraph_node_hook hook, void *data)
 
 /* Remove ENTRY from the list of hooks called on removing nodes.  */
 void
-cgraph_remove_node_removal_hook (struct cgraph_node_hook_list *entry)
+symbol_table::remove_cgraph_removal_hook (cgraph_node_hook_list *entry)
 {
-  struct cgraph_node_hook_list **ptr = &first_cgraph_node_removal_hook;
+  cgraph_node_hook_list **ptr = &m_first_cgraph_removal_hook;
 
   while (*ptr != entry)
     ptr = &(*ptr)->next;
@@ -355,10 +350,22 @@ cgraph_remove_node_removal_hook (struct cgraph_node_hook_list *entry)
 }
 
 /* Call all node removal hooks.  */
-static void
-cgraph_call_node_removal_hooks (struct cgraph_node *node)
+void
+symbol_table::call_cgraph_removal_hooks (cgraph_node *node)
+{
+  cgraph_node_hook_list *entry = m_first_cgraph_removal_hook;
+  while (entry)
+  {
+    entry->hook (node, entry->data);
+    entry = entry->next;
+  }
+}
+
+/* Call all node removal hooks.  */
+void
+symbol_table::call_cgraph_insertion_hooks (cgraph_node *node)
 {
-  struct cgraph_node_hook_list *entry = first_cgraph_node_removal_hook;
+  cgraph_node_hook_list *entry = m_first_cgraph_insertion_hook;
   while (entry)
   {
     entry->hook (node, entry->data);
@@ -366,14 +373,15 @@ cgraph_call_node_removal_hooks (struct cgraph_node *node)
   }
 }
 
+
 /* Register HOOK to be called with DATA on each inserted node.  */
-struct cgraph_node_hook_list *
-cgraph_add_function_insertion_hook (cgraph_node_hook hook, void *data)
+cgraph_node_hook_list *
+symbol_table::add_cgraph_insertion_hook (cgraph_node_hook hook, void *data)
 {
-  struct cgraph_node_hook_list *entry;
-  struct cgraph_node_hook_list **ptr = &first_cgraph_function_insertion_hook;
+  cgraph_node_hook_list *entry;
+  cgraph_node_hook_list **ptr = &m_first_cgraph_insertion_hook;
 
-  entry = (struct cgraph_node_hook_list *) xmalloc (sizeof (*entry));
+  entry = (cgraph_node_hook_list *) xmalloc (sizeof (*entry));
   entry->hook = hook;
   entry->data = data;
   entry->next = NULL;
@@ -385,9 +393,9 @@ cgraph_add_function_insertion_hook (cgraph_node_hook hook, void *data)
 
 /* Remove ENTRY from the list of hooks called on inserted nodes.  */
 void
-cgraph_remove_function_insertion_hook (struct cgraph_node_hook_list *entry)
+symbol_table::remove_cgraph_insertion_hook (cgraph_node_hook_list *entry)
 {
-  struct cgraph_node_hook_list **ptr = &first_cgraph_function_insertion_hook;
+  cgraph_node_hook_list **ptr = &m_first_cgraph_insertion_hook;
 
   while (*ptr != entry)
     ptr = &(*ptr)->next;
@@ -395,26 +403,14 @@ cgraph_remove_function_insertion_hook (struct cgraph_node_hook_list *entry)
   free (entry);
 }
 
-/* Call all node insertion hooks.  */
-void
-cgraph_call_function_insertion_hooks (struct cgraph_node *node)
-{
-  struct cgraph_node_hook_list *entry = first_cgraph_function_insertion_hook;
-  while (entry)
-  {
-    entry->hook (node, entry->data);
-    entry = entry->next;
-  }
-}
-
 /* Register HOOK to be called with DATA on each duplicated edge.  */
-struct cgraph_2edge_hook_list *
-cgraph_add_edge_duplication_hook (cgraph_2edge_hook hook, void *data)
+cgraph_2edge_hook_list *
+symbol_table::add_edge_duplication_hook (cgraph_2edge_hook hook, void *data)
 {
-  struct cgraph_2edge_hook_list *entry;
-  struct cgraph_2edge_hook_list **ptr = &first_cgraph_edge_duplicated_hook;
+  cgraph_2edge_hook_list *entry;
+  cgraph_2edge_hook_list **ptr = &m_first_edge_duplicated_hook;
 
-  entry = (struct cgraph_2edge_hook_list *) xmalloc (sizeof (*entry));
+  entry = (cgraph_2edge_hook_list *) xmalloc (sizeof (*entry));
   entry->hook = hook;
   entry->data = data;
   entry->next = NULL;
@@ -426,9 +422,9 @@ cgraph_add_edge_duplication_hook (cgraph_2edge_hook hook, void *data)
 
 /* Remove ENTRY from the list of hooks called on duplicating edges.  */
 void
-cgraph_remove_edge_duplication_hook (struct cgraph_2edge_hook_list *entry)
+symbol_table::remove_edge_duplication_hook (cgraph_2edge_hook_list *entry)
 {
-  struct cgraph_2edge_hook_list **ptr = &first_cgraph_edge_duplicated_hook;
+  cgraph_2edge_hook_list **ptr = &m_first_edge_duplicated_hook;
 
   while (*ptr != entry)
     ptr = &(*ptr)->next;
@@ -438,10 +434,9 @@ cgraph_remove_edge_duplication_hook (struct cgraph_2edge_hook_list *entry)
 
 /* Call all edge duplication hooks.  */
 void
-cgraph_call_edge_duplication_hooks (struct cgraph_edge *cs1,
-                                   struct cgraph_edge *cs2)
+symbol_table::call_edge_duplication_hooks (cgraph_edge *cs1, cgraph_edge *cs2)
 {
-  struct cgraph_2edge_hook_list *entry = first_cgraph_edge_duplicated_hook;
+  cgraph_2edge_hook_list *entry = m_first_edge_duplicated_hook;
   while (entry)
   {
     entry->hook (cs1, cs2, entry->data);
@@ -450,13 +445,13 @@ cgraph_call_edge_duplication_hooks (struct cgraph_edge *cs1,
 }
 
 /* Register HOOK to be called with DATA on each duplicated node.  */
-struct cgraph_2node_hook_list *
-cgraph_add_node_duplication_hook (cgraph_2node_hook hook, void *data)
+cgraph_2node_hook_list *
+symbol_table::add_cgraph_duplication_hook (cgraph_2node_hook hook, void *data)
 {
-  struct cgraph_2node_hook_list *entry;
-  struct cgraph_2node_hook_list **ptr = &first_cgraph_node_duplicated_hook;
+  cgraph_2node_hook_list *entry;
+  cgraph_2node_hook_list **ptr = &m_first_cgraph_duplicated_hook;
 
-  entry = (struct cgraph_2node_hook_list *) xmalloc (sizeof (*entry));
+  entry = (cgraph_2node_hook_list *) xmalloc (sizeof (*entry));
   entry->hook = hook;
   entry->data = data;
   entry->next = NULL;
@@ -468,9 +463,9 @@ cgraph_add_node_duplication_hook (cgraph_2node_hook hook, void *data)
 
 /* Remove ENTRY from the list of hooks called on duplicating nodes.  */
 void
-cgraph_remove_node_duplication_hook (struct cgraph_2node_hook_list *entry)
+symbol_table::remove_cgraph_duplication_hook (cgraph_2node_hook_list *entry)
 {
-  struct cgraph_2node_hook_list **ptr = &first_cgraph_node_duplicated_hook;
+  cgraph_2node_hook_list **ptr = &m_first_cgraph_duplicated_hook;
 
   while (*ptr != entry)
     ptr = &(*ptr)->next;
@@ -480,66 +475,40 @@ cgraph_remove_node_duplication_hook (struct cgraph_2node_hook_list *entry)
 
 /* Call all node duplication hooks.  */
 void
-cgraph_call_node_duplication_hooks (struct cgraph_node *node1,
-                                   struct cgraph_node *node2)
+symbol_table::call_cgraph_duplication_hooks (cgraph_node *node,
+                                            cgraph_node *node2)
 {
-  struct cgraph_2node_hook_list *entry = first_cgraph_node_duplicated_hook;
+  cgraph_2node_hook_list *entry = m_first_cgraph_duplicated_hook;
   while (entry)
   {
-    entry->hook (node1, node2, entry->data);
+    entry->hook (node, node2, entry->data);
     entry = entry->next;
   }
 }
 
-/* Allocate new callgraph node.  */
-
-static inline struct cgraph_node *
-cgraph_allocate_node (void)
-{
-  struct cgraph_node *node;
-
-  if (free_nodes)
-    {
-      node = free_nodes;
-      free_nodes = NEXT_FREE_NODE (node);
-    }
-  else
-    {
-      node = ggc_alloc_cleared_cgraph_node ();
-      node->uid = cgraph_max_uid++;
-    }
-
-  return node;
-}
-
-/* Allocate new callgraph node and insert it into basic data structures.  */
-
-struct cgraph_node *
-cgraph_create_empty_node (void)
-{
-  struct cgraph_node *node = cgraph_allocate_node ();
-
-  node->type = SYMTAB_FUNCTION;
-  node->frequency = NODE_FREQUENCY_NORMAL;
-  node->count_materialization_scale = REG_BR_PROB_BASE;
-  cgraph_n_nodes++;
-  return node;
-}
-
 /* Return cgraph node assigned to DECL.  Create new one when needed.  */
 
-struct cgraph_node *
-cgraph_create_node (tree decl)
+cgraph_node *
+cgraph_node::create (tree decl)
 {
-  struct cgraph_node *node = cgraph_create_empty_node ();
+  cgraph_node *node = symtab->create_empty ();
   gcc_assert (TREE_CODE (decl) == FUNCTION_DECL);
 
   node->decl = decl;
-  symtab_register_node (node);
+
+  if ((flag_openacc || flag_openmp)
+      && lookup_attribute ("omp declare target", DECL_ATTRIBUTES (decl)))
+    {
+      node->offloadable = 1;
+      if (ENABLE_OFFLOADING)
+       g->have_offload = true;
+    }
+
+  node->register_symbol ();
 
   if (DECL_CONTEXT (decl) && TREE_CODE (DECL_CONTEXT (decl)) == FUNCTION_DECL)
     {
-      node->origin = cgraph_get_create_node (DECL_CONTEXT (decl));
+      node->origin = cgraph_node::get_create (DECL_CONTEXT (decl));
       node->next_nested = node->origin->nested;
       node->origin->nested = node;
     }
@@ -549,77 +518,76 @@ cgraph_create_node (tree decl)
 /* Try to find a call graph node for declaration DECL and if it does not exist
    or if it corresponds to an inline clone, create a new one.  */
 
-struct cgraph_node *
-cgraph_get_create_node (tree decl)
+cgraph_node *
+cgraph_node::get_create (tree decl)
 {
-  struct cgraph_node *first_clone = cgraph_get_node (decl);
+  cgraph_node *first_clone = cgraph_node::get (decl);
 
   if (first_clone && !first_clone->global.inlined_to)
     return first_clone;
 
-  struct cgraph_node *node = cgraph_create_node (decl);
+  cgraph_node *node = cgraph_node::create (decl);
   if (first_clone)
     {
       first_clone->clone_of = node;
       node->clones = first_clone;
-      symtab_prevail_in_asm_name_hash (node);
-      symtab_insert_node_to_hashtable (node);
+      symtab->symtab_prevail_in_asm_name_hash (node);
+      node->decl->decl_with_vis.symtab_node = node;
       if (dump_file)
        fprintf (dump_file, "Introduced new external node "
                 "(%s/%i) and turned into root of the clone tree.\n",
-                xstrdup (node->name ()), node->order);
+                node->name (), node->order);
     }
   else if (dump_file)
     fprintf (dump_file, "Introduced new external node "
-            "(%s/%i).\n", xstrdup (node->name ()),
-            node->order);
+            "(%s/%i).\n", node->name (), node->order);
   return node;
 }
 
 /* Mark ALIAS as an alias to DECL.  DECL_NODE is cgraph node representing
    the function body is associated with (not necessarily cgraph_node (DECL).  */
 
-struct cgraph_node *
-cgraph_create_function_alias (tree alias, tree target)
+cgraph_node *
+cgraph_node::create_alias (tree alias, tree target)
 {
-  struct cgraph_node *alias_node;
+  cgraph_node *alias_node;
 
   gcc_assert (TREE_CODE (target) == FUNCTION_DECL
              || TREE_CODE (target) == IDENTIFIER_NODE);
   gcc_assert (TREE_CODE (alias) == FUNCTION_DECL);
-  alias_node = cgraph_get_create_node (alias);
+  alias_node = cgraph_node::get_create (alias);
   gcc_assert (!alias_node->definition);
   alias_node->alias_target = target;
   alias_node->definition = true;
   alias_node->alias = true;
   if (lookup_attribute ("weakref", DECL_ATTRIBUTES (alias)) != NULL)
-    alias_node->weakref = true;
+    alias_node->transparent_alias = alias_node->weakref = true;
   return alias_node;
 }
 
 /* Attempt to mark ALIAS as an alias to DECL.  Return alias node if successful
    and NULL otherwise.
    Same body aliases are output whenever the body of DECL is output,
-   and cgraph_get_node (ALIAS) transparently returns cgraph_get_node (DECL).  */
+   and cgraph_node::get (ALIAS) transparently returns
+   cgraph_node::get (DECL).  */
 
-struct cgraph_node *
-cgraph_same_body_alias (struct cgraph_node *decl_node ATTRIBUTE_UNUSED, tree alias, tree decl)
+cgraph_node *
+cgraph_node::create_same_body_alias (tree alias, tree decl)
 {
-  struct cgraph_node *n;
+  cgraph_node *n;
 #ifndef ASM_OUTPUT_DEF
   /* If aliases aren't supported by the assembler, fail.  */
   return NULL;
 #endif
   /* Langhooks can create same body aliases of symbols not defined.
      Those are useless. Drop them on the floor.  */
-  if (cgraph_global_info_ready)
+  if (symtab->global_info_ready)
     return NULL;
 
-  n = cgraph_create_function_alias (alias, decl);
+  n = cgraph_node::create_alias (alias, decl);
   n->cpp_implicit_alias = true;
-  if (cpp_implicit_aliases_done)
-    symtab_resolve_alias (n,
-                         cgraph_get_node (decl));
+  if (symtab->cpp_implicit_aliases_done)
+    n->resolve_alias (cgraph_node::get (decl));
   return n;
 }
 
@@ -627,29 +595,22 @@ cgraph_same_body_alias (struct cgraph_node *decl_node ATTRIBUTE_UNUSED, tree ali
    aliases DECL with an adjustments made into the first parameter.
    See comments in thunk_adjust for detail on the parameters.  */
 
-struct cgraph_node *
-cgraph_add_thunk (struct cgraph_node *decl_node ATTRIBUTE_UNUSED,
-                 tree alias, tree decl ATTRIBUTE_UNUSED,
-                 bool this_adjusting,
-                 HOST_WIDE_INT fixed_offset, HOST_WIDE_INT virtual_value,
-                 tree virtual_offset,
-                 tree real_alias)
+cgraph_node *
+cgraph_node::create_thunk (tree alias, tree, bool this_adjusting,
+                          HOST_WIDE_INT fixed_offset,
+                          HOST_WIDE_INT virtual_value,
+                          tree virtual_offset,
+                          tree real_alias)
 {
-  struct cgraph_node *node;
+  cgraph_node *node;
 
-  node = cgraph_get_node (alias);
+  node = cgraph_node::get (alias);
   if (node)
-    {
-      gcc_assert (node->definition);
-      gcc_assert (!node->alias);
-      gcc_assert (!node->thunk.thunk_p);
-      cgraph_remove_node (node);
-    }
-  
-  node = cgraph_create_node (alias);
+    node->reset ();
+  else
+    node = cgraph_node::create (alias);
   gcc_checking_assert (!virtual_offset
-                      || tree_to_double_int (virtual_offset) ==
-                            double_int::from_shwi (virtual_value));
+                      || wi::eq_p (virtual_offset, virtual_value));
   node->thunk.fixed_offset = fixed_offset;
   node->thunk.this_adjusting = this_adjusting;
   node->thunk.virtual_value = virtual_value;
@@ -664,15 +625,15 @@ cgraph_add_thunk (struct cgraph_node *decl_node ATTRIBUTE_UNUSED,
 /* Return the cgraph node that has ASMNAME for its DECL_ASSEMBLER_NAME.
    Return NULL if there's no such node.  */
 
-struct cgraph_node *
-cgraph_node_for_asm (tree asmname)
+cgraph_node *
+cgraph_node::get_for_asmname (tree asmname)
 {
   /* We do not want to look at inline clones.  */
-  for (symtab_node *node = symtab_node_for_asm (asmname);
+  for (symtab_node *node = symtab_node::get_for_asmname (asmname);
        node;
        node = node->next_sharing_asm_name)
     {
-      cgraph_node *cn = dyn_cast <cgraph_node> (node);
+      cgraph_node *cn = dyn_cast <cgraph_node *> (node);
       if (cn && !cn->global.inlined_to)
        return cn;
     }
@@ -681,50 +642,56 @@ cgraph_node_for_asm (tree asmname)
 
 /* Returns a hash value for X (which really is a cgraph_edge).  */
 
-static hashval_t
-edge_hash (const void *x)
+hashval_t
+cgraph_edge_hasher::hash (cgraph_edge *e)
 {
-  return htab_hash_pointer (((const struct cgraph_edge *) x)->call_stmt);
+  /* This is a really poor hash function, but it is what htab_hash_pointer
+     uses.  */
+  return (hashval_t) ((intptr_t)e->call_stmt >> 3);
 }
 
-/* Return nonzero if the call_stmt of of cgraph_edge X is stmt *Y.  */
+/* Returns a hash value for X (which really is a cgraph_edge).  */
 
-static int
-edge_eq (const void *x, const void *y)
+hashval_t
+cgraph_edge_hasher::hash (gimple *call_stmt)
 {
-  return ((const struct cgraph_edge *) x)->call_stmt == y;
+  /* This is a really poor hash function, but it is what htab_hash_pointer
+     uses.  */
+  return (hashval_t) ((intptr_t)call_stmt >> 3);
+}
+
+/* Return nonzero if the call_stmt of cgraph_edge X is stmt *Y.  */
+
+inline bool
+cgraph_edge_hasher::equal (cgraph_edge *x, gimple *y)
+{
+  return x->call_stmt == y;
 }
 
 /* Add call graph edge E to call site hash of its caller.  */
 
 static inline void
-cgraph_update_edge_in_call_site_hash (struct cgraph_edge *e)
+cgraph_update_edge_in_call_site_hash (cgraph_edge *e)
 {
-  void **slot;
-  slot = htab_find_slot_with_hash (e->caller->call_site_hash,
-                                  e->call_stmt,
-                                  htab_hash_pointer (e->call_stmt),
-                                  INSERT);
-  *slot = e;
+  gimple *call = e->call_stmt;
+  *e->caller->call_site_hash->find_slot_with_hash
+      (call, cgraph_edge_hasher::hash (call), INSERT) = e;
 }
 
 /* Add call graph edge E to call site hash of its caller.  */
 
 static inline void
-cgraph_add_edge_to_call_site_hash (struct cgraph_edge *e)
+cgraph_add_edge_to_call_site_hash (cgraph_edge *e)
 {
-  void **slot;
   /* There are two speculative edges for every statement (one direct,
      one indirect); always hash the direct one.  */
   if (e->speculative && e->indirect_unknown_callee)
     return;
-  slot = htab_find_slot_with_hash (e->caller->call_site_hash,
-                                  e->call_stmt,
-                                  htab_hash_pointer (e->call_stmt),
-                                  INSERT);
+  cgraph_edge **slot = e->caller->call_site_hash->find_slot_with_hash
+      (e->call_stmt, cgraph_edge_hasher::hash (e->call_stmt), INSERT);
   if (*slot)
     {
-      gcc_assert (((struct cgraph_edge *)*slot)->speculative);
+      gcc_assert (((cgraph_edge *)*slot)->speculative);
       if (e->callee)
        *slot = e;
       return;
@@ -736,23 +703,22 @@ cgraph_add_edge_to_call_site_hash (struct cgraph_edge *e)
 /* Return the callgraph edge representing the GIMPLE_CALL statement
    CALL_STMT.  */
 
-struct cgraph_edge *
-cgraph_edge (struct cgraph_node *node, gimple call_stmt)
+cgraph_edge *
+cgraph_node::get_edge (gimple *call_stmt)
 {
-  struct cgraph_edge *e, *e2;
+  cgraph_edge *e, *e2;
   int n = 0;
 
-  if (node->call_site_hash)
-    return (struct cgraph_edge *)
-      htab_find_with_hash (node->call_site_hash, call_stmt,
-                          htab_hash_pointer (call_stmt));
+  if (call_site_hash)
+    return call_site_hash->find_with_hash
+       (call_stmt, cgraph_edge_hasher::hash (call_stmt));
 
   /* This loop may turn out to be performance problem.  In such case adding
      hashtables into call nodes with very many edges is probably best
      solution.  It is not good idea to add pointer into CALL_EXPR itself
      because we want to make possible having multiple cgraph nodes representing
      different clones of the same body before the body is actually cloned.  */
-  for (e = node->callees; e; e = e->next_callee)
+  for (e = callees; e; e = e->next_callee)
     {
       if (e->call_stmt == call_stmt)
        break;
@@ -760,7 +726,7 @@ cgraph_edge (struct cgraph_node *node, gimple call_stmt)
     }
 
   if (!e)
-    for (e = node->indirect_calls; e; e = e->next_callee)
+    for (e = indirect_calls; e; e = e->next_callee)
       {
        if (e->call_stmt == call_stmt)
          break;
@@ -769,10 +735,10 @@ cgraph_edge (struct cgraph_node *node, gimple call_stmt)
 
   if (n > 100)
     {
-      node->call_site_hash = htab_create_ggc (120, edge_hash, edge_eq, NULL);
-      for (e2 = node->callees; e2; e2 = e2->next_callee)
+      call_site_hash = hash_table<cgraph_edge_hasher>::create_ggc (120);
+      for (e2 = callees; e2; e2 = e2->next_callee)
        cgraph_add_edge_to_call_site_hash (e2);
-      for (e2 = node->indirect_calls; e2; e2 = e2->next_callee)
+      for (e2 = indirect_calls; e2; e2 = e2->next_callee)
        cgraph_add_edge_to_call_site_hash (e2);
     }
 
@@ -780,49 +746,49 @@ cgraph_edge (struct cgraph_node *node, gimple call_stmt)
 }
 
 
-/* Change field call_stmt of edge to NEW_STMT.
+/* Change field call_stmt of edge to NEW_STMT.
    If UPDATE_SPECULATIVE and E is any component of speculative
    edge, then update all components.  */
 
 void
-cgraph_set_call_stmt (struct cgraph_edge *e, gimple new_stmt,
-                     bool update_speculative)
+cgraph_edge::set_call_stmt (gcall *new_stmt, bool update_speculative)
 {
   tree decl;
 
   /* Speculative edges has three component, update all of them
      when asked to.  */
-  if (update_speculative && e->speculative)
+  if (update_speculative && speculative)
     {
-      struct cgraph_edge *direct, *indirect;
-      struct ipa_ref *ref;
+      cgraph_edge *direct, *indirect;
+      ipa_ref *ref;
 
-      cgraph_speculative_call_info (e, direct, indirect, ref);
-      cgraph_set_call_stmt (direct, new_stmt, false);
-      cgraph_set_call_stmt (indirect, new_stmt, false);
+      speculative_call_info (direct, indirect, ref);
+      direct->set_call_stmt (new_stmt, false);
+      indirect->set_call_stmt (new_stmt, false);
       ref->stmt = new_stmt;
       return;
     }
 
   /* Only direct speculative edges go to call_site_hash.  */
-  if (e->caller->call_site_hash
-      && (!e->speculative || !e->indirect_unknown_callee))
+  if (caller->call_site_hash
+      && (!speculative || !indirect_unknown_callee))
     {
-      htab_remove_elt_with_hash (e->caller->call_site_hash,
-                                e->call_stmt,
-                                htab_hash_pointer (e->call_stmt));
+      caller->call_site_hash->remove_elt_with_hash
+       (call_stmt, cgraph_edge_hasher::hash (call_stmt));
     }
 
-  e->call_stmt = new_stmt;
-  if (e->indirect_unknown_callee
+  cgraph_edge *e = this;
+
+  call_stmt = new_stmt;
+  if (indirect_unknown_callee
       && (decl = gimple_call_fndecl (new_stmt)))
     {
       /* Constant propagation (and possibly also inlining?) can turn an
         indirect call into a direct one.  */
-      struct cgraph_node *new_callee = cgraph_get_node (decl);
+      cgraph_node *new_callee = cgraph_node::get (decl);
 
       gcc_checking_assert (new_callee);
-      e = cgraph_make_edge_direct (e, new_callee);
+      e = make_direct (new_callee);
     }
 
   push_cfun (DECL_STRUCT_FUNCTION (e->caller->decl));
@@ -836,12 +802,12 @@ cgraph_set_call_stmt (struct cgraph_edge *e, gimple new_stmt,
    parameters of which only CALLEE can be NULL (when creating an indirect call
    edge).  */
 
-static struct cgraph_edge *
-cgraph_create_edge_1 (struct cgraph_node *caller, struct cgraph_node *callee,
-                      gimple call_stmt, gcov_type count, int freq,
-                      bool indir_unknown_callee)
+cgraph_edge *
+symbol_table::create_edge (cgraph_node *caller, cgraph_node *callee,
+                          gcall *call_stmt, gcov_type count, int freq,
+                          bool indir_unknown_callee)
 {
-  struct cgraph_edge *edge;
+  cgraph_edge *edge;
 
   /* LTO does not actually have access to the call_stmt since these
      have not been loaded yet.  */
@@ -849,10 +815,9 @@ cgraph_create_edge_1 (struct cgraph_node *caller, struct cgraph_node *callee,
     {
       /* This is a rather expensive check possibly triggering
         construction of call stmt hashtable.  */
-#ifdef ENABLE_CHECKING
-      struct cgraph_edge *e;
-      gcc_checking_assert (!(e=cgraph_edge (caller, call_stmt)) || e->speculative);
-#endif
+      cgraph_edge *e;
+      gcc_checking_assert (!(e = caller->get_edge (call_stmt))
+                          || e->speculative);
 
       gcc_assert (is_gimple_call (call_stmt));
     }
@@ -864,10 +829,12 @@ cgraph_create_edge_1 (struct cgraph_node *caller, struct cgraph_node *callee,
     }
   else
     {
-      edge = ggc_alloc_cgraph_edge ();
-      edge->uid = cgraph_edge_max_uid++;
+      edge = ggc_alloc<cgraph_edge> ();
+      edge->uid = edges_max_uid++;
     }
 
+  edges_count++;
+
   edge->aux = NULL;
   edge->caller = caller;
   edge->callee = callee;
@@ -900,30 +867,37 @@ cgraph_create_edge_1 (struct cgraph_node *caller, struct cgraph_node *callee,
   edge->indirect_inlining_edge = 0;
   edge->speculative = false;
   edge->indirect_unknown_callee = indir_unknown_callee;
+  if (opt_for_fn (edge->caller->decl, flag_devirtualize)
+      && call_stmt && DECL_STRUCT_FUNCTION (caller->decl))
+    edge->in_polymorphic_cdtor
+      = decl_maybe_in_construction_p (NULL, NULL, call_stmt,
+                                     caller->decl);
+  else
+    edge->in_polymorphic_cdtor = caller->thunk.thunk_p;
   if (call_stmt && caller->call_site_hash)
     cgraph_add_edge_to_call_site_hash (edge);
 
   return edge;
 }
 
-/* Create edge from CALLER to CALLEE in the cgraph.  */
+/* Create edge from a given function to CALLEE in the cgraph.  */
 
-struct cgraph_edge *
-cgraph_create_edge (struct cgraph_node *caller, struct cgraph_node *callee,
-                   gimple call_stmt, gcov_type count, int freq)
+cgraph_edge *
+cgraph_node::create_edge (cgraph_node *callee,
+                         gcall *call_stmt, gcov_type count, int freq)
 {
-  struct cgraph_edge *edge = cgraph_create_edge_1 (caller, callee, call_stmt,
-                                                  count, freq, false);
+  cgraph_edge *edge = symtab->create_edge (this, callee, call_stmt, count,
+                                          freq, false);
 
   initialize_inline_failed (edge);
 
   edge->next_caller = callee->callers;
   if (callee->callers)
     callee->callers->prev_caller = edge;
-  edge->next_callee = caller->callees;
-  if (caller->callees)
-    caller->callees->prev_callee = edge;
-  caller->callees = edge;
+  edge->next_callee = callees;
+  if (callees)
+    callees->prev_callee = edge;
+  callees = edge;
   callee->callers = edge;
 
   return edge;
@@ -931,12 +905,12 @@ cgraph_create_edge (struct cgraph_node *caller, struct cgraph_node *callee,
 
 /* Allocate cgraph_indirect_call_info and set its fields to default values. */
 
-struct cgraph_indirect_call_info *
+cgraph_indirect_call_info *
 cgraph_allocate_init_indirect_info (void)
 {
-  struct cgraph_indirect_call_info *ii;
+  cgraph_indirect_call_info *ii;
 
-  ii = ggc_alloc_cleared_cgraph_indirect_call_info ();
+  ii = ggc_cleared_alloc<cgraph_indirect_call_info> ();
   ii->param_index = -1;
   return ii;
 }
@@ -945,95 +919,72 @@ cgraph_allocate_init_indirect_info (void)
    statement destination is a formal parameter of the caller with index
    PARAM_INDEX. */
 
-struct cgraph_edge *
-cgraph_create_indirect_edge (struct cgraph_node *caller, gimple call_stmt,
-                            int ecf_flags,
-                            gcov_type count, int freq)
+cgraph_edge *
+cgraph_node::create_indirect_edge (gcall *call_stmt, int ecf_flags,
+                                  gcov_type count, int freq,
+                                  bool compute_indirect_info)
 {
-  struct cgraph_edge *edge = cgraph_create_edge_1 (caller, NULL, call_stmt,
-                                                  count, freq, true);
+  cgraph_edge *edge = symtab->create_edge (this, NULL, call_stmt,
+                                                           count, freq, true);
   tree target;
 
   initialize_inline_failed (edge);
 
   edge->indirect_info = cgraph_allocate_init_indirect_info ();
   edge->indirect_info->ecf_flags = ecf_flags;
+  edge->indirect_info->vptr_changed = true;
 
   /* Record polymorphic call info.  */
-  if (call_stmt
+  if (compute_indirect_info
+      && call_stmt
       && (target = gimple_call_fn (call_stmt))
       && virtual_method_call_p (target))
     {
-      tree otr_type;
-      HOST_WIDE_INT otr_token;
-      ipa_polymorphic_call_context context;
-
-      get_polymorphic_call_info (caller->decl,
-                                target,
-                                &otr_type, &otr_token,
-                                &context);
+      ipa_polymorphic_call_context context (decl, target, call_stmt);
 
       /* Only record types can have virtual calls.  */
-      gcc_assert (TREE_CODE (otr_type) == RECORD_TYPE);
       edge->indirect_info->polymorphic = true;
       edge->indirect_info->param_index = -1;
-      edge->indirect_info->otr_token = otr_token;
-      edge->indirect_info->otr_type = otr_type;
-      edge->indirect_info->outer_type = context.outer_type;
-      edge->indirect_info->offset = context.offset;
-      edge->indirect_info->maybe_in_construction
-        = context.maybe_in_construction;
-      edge->indirect_info->maybe_derived_type = context.maybe_derived_type;
+      edge->indirect_info->otr_token
+        = tree_to_uhwi (OBJ_TYPE_REF_TOKEN (target));
+      edge->indirect_info->otr_type = obj_type_ref_class (target);
+      gcc_assert (TREE_CODE (edge->indirect_info->otr_type) == RECORD_TYPE);
+      edge->indirect_info->context = context;
     }
 
-  edge->next_callee = caller->indirect_calls;
-  if (caller->indirect_calls)
-    caller->indirect_calls->prev_callee = edge;
-  caller->indirect_calls = edge;
+  edge->next_callee = indirect_calls;
+  if (indirect_calls)
+    indirect_calls->prev_callee = edge;
+  indirect_calls = edge;
 
   return edge;
 }
 
-/* Remove the edge E from the list of the callers of the callee.  */
-
-static inline void
-cgraph_edge_remove_callee (struct cgraph_edge *e)
-{
-  gcc_assert (!e->indirect_unknown_callee);
-  if (e->prev_caller)
-    e->prev_caller->next_caller = e->next_caller;
-  if (e->next_caller)
-    e->next_caller->prev_caller = e->prev_caller;
-  if (!e->prev_caller)
-    e->callee->callers = e->next_caller;
-}
-
-/* Remove the edge E from the list of the callees of the caller.  */
+/* Remove the edge from the list of the callees of the caller.  */
 
-static inline void
-cgraph_edge_remove_caller (struct cgraph_edge *e)
+void
+cgraph_edge::remove_caller (void)
 {
-  if (e->prev_callee)
-    e->prev_callee->next_callee = e->next_callee;
-  if (e->next_callee)
-    e->next_callee->prev_callee = e->prev_callee;
-  if (!e->prev_callee)
+  if (prev_callee)
+    prev_callee->next_callee = next_callee;
+  if (next_callee)
+    next_callee->prev_callee = prev_callee;
+  if (!prev_callee)
     {
-      if (e->indirect_unknown_callee)
-       e->caller->indirect_calls = e->next_callee;
+      if (indirect_unknown_callee)
+       caller->indirect_calls = next_callee;
       else
-       e->caller->callees = e->next_callee;
+       caller->callees = next_callee;
     }
-  if (e->caller->call_site_hash)
-    htab_remove_elt_with_hash (e->caller->call_site_hash,
-                              e->call_stmt,
-                              htab_hash_pointer (e->call_stmt));
+  if (caller->call_site_hash)
+    caller->call_site_hash->remove_elt_with_hash
+       (call_stmt, cgraph_edge_hasher::hash (call_stmt));
 }
 
 /* Put the edge onto the free list.  */
 
-static void
-cgraph_free_edge (struct cgraph_edge *e)
+void
+symbol_table::free_edge (cgraph_edge *e)
 {
   int uid = e->uid;
 
@@ -1045,42 +996,29 @@ cgraph_free_edge (struct cgraph_edge *e)
   e->uid = uid;
   NEXT_FREE_EDGE (e) = free_edges;
   free_edges = e;
+  edges_count--;
 }
 
-/* Remove the edge in the cgraph.  */
+/* Remove the edge in the cgraph.  */
 
 void
-cgraph_remove_edge (struct cgraph_edge *e)
+cgraph_edge::remove (void)
 {
   /* Call all edge removal hooks.  */
-  cgraph_call_edge_removal_hooks (e);
+  symtab->call_edge_removal_hooks (this);
 
-  if (!e->indirect_unknown_callee)
+  if (!indirect_unknown_callee)
     /* Remove from callers list of the callee.  */
-    cgraph_edge_remove_callee (e);
+    remove_callee ();
 
   /* Remove from callees list of the callers.  */
-  cgraph_edge_remove_caller (e);
+  remove_caller ();
 
   /* Put the edge onto the free list.  */
-  cgraph_free_edge (e);
+  symtab->free_edge (this);
 }
 
-/* Set callee of call graph edge E and add it to the corresponding set of
-   callers. */
-
-static void
-cgraph_set_edge_callee (struct cgraph_edge *e, struct cgraph_node *n)
-{
-  e->prev_caller = NULL;
-  if (n->callers)
-    n->callers->prev_caller = e;
-  e->next_caller = n->callers;
-  n->callers = e;
-  e->callee = n;
-}
-
-/* Turn edge E into speculative call calling N2. Update
+/* Turn edge into speculative call calling N2. Update
    the profile so the direct call is taken COUNT times
    with FREQUENCY.  
 
@@ -1098,40 +1036,38 @@ cgraph_set_edge_callee (struct cgraph_edge *e, struct cgraph_node *n)
 
    Return direct edge created.  */
 
-struct cgraph_edge *
-cgraph_turn_edge_to_speculative (struct cgraph_edge *e,
-                                struct cgraph_node *n2,
-                                gcov_type direct_count,
-                                int direct_frequency)
+cgraph_edge *
+cgraph_edge::make_speculative (cgraph_node *n2, gcov_type direct_count,
+                              int direct_frequency)
 {
-  struct cgraph_node *n = e->caller;
-  struct ipa_ref *ref;
-  struct cgraph_edge *e2;
+  cgraph_node *n = caller;
+  ipa_ref *ref = NULL;
+  cgraph_edge *e2;
 
   if (dump_file)
     {
       fprintf (dump_file, "Indirect call -> speculative call"
               " %s/%i => %s/%i\n",
-              xstrdup (n->name ()), n->order,
-              xstrdup (n2->name ()), n2->order);
+              xstrdup_for_dump (n->name ()), n->order,
+              xstrdup_for_dump (n2->name ()), n2->order);
     }
-  e->speculative = true;
-  e2 = cgraph_create_edge (n, n2, e->call_stmt, direct_count, direct_frequency);
+  speculative = true;
+  e2 = n->create_edge (n2, call_stmt, direct_count, direct_frequency);
   initialize_inline_failed (e2);
   e2->speculative = true;
   if (TREE_NOTHROW (n2->decl))
     e2->can_throw_external = false;
   else
-    e2->can_throw_external = e->can_throw_external;
-  e2->lto_stmt_uid = e->lto_stmt_uid;
-  e->count -= e2->count;
-  e->frequency -= e2->frequency;
-  cgraph_call_edge_duplication_hooks (e, e2);
-  ref = ipa_record_reference (n, n2,
-                             IPA_REF_ADDR, e->call_stmt);
-  ref->lto_stmt_uid = e->lto_stmt_uid;
-  ref->speculative = e->speculative;
-  cgraph_mark_address_taken_node (n2);
+    e2->can_throw_external = can_throw_external;
+  e2->lto_stmt_uid = lto_stmt_uid;
+  e2->in_polymorphic_cdtor = in_polymorphic_cdtor;
+  count -= e2->count;
+  frequency -= e2->frequency;
+  symtab->call_edge_duplication_hooks (this, e2);
+  ref = n->create_reference (n2, IPA_REF_ADDR, call_stmt);
+  ref->lto_stmt_uid = lto_stmt_uid;
+  ref->speculative = speculative;
+  n2->mark_address_taken ();
   return e2;
 }
 
@@ -1142,18 +1078,18 @@ cgraph_turn_edge_to_speculative (struct cgraph_edge *e,
    All three components are attached to single statement (the indirect
    call) and if one of them exists, all of them must exist.
 
-   Given speculative call edge E, return all three components. 
+   Given speculative call edge, return all three components.
  */
 
 void
-cgraph_speculative_call_info (struct cgraph_edge *e,
-                             struct cgraph_edge *&direct,
-                             struct cgraph_edge *&indirect,
-                             struct ipa_ref *&reference)
+cgraph_edge::speculative_call_info (cgraph_edge *&direct,
+                                   cgraph_edge *&indirect,
+                                   ipa_ref *&reference)
 {
-  struct ipa_ref *ref;
+  ipa_ref *ref;
   int i;
-  struct cgraph_edge *e2;
+  cgraph_edge *e2;
+  cgraph_edge *e = this;
 
   if (!e->indirect_unknown_callee)
     for (e2 = e->caller->indirect_calls;
@@ -1166,7 +1102,7 @@ cgraph_speculative_call_info (struct cgraph_edge *e,
       /* We can take advantage of the call stmt hash.  */
       if (e2->call_stmt)
        {
-         e = cgraph_edge (e->caller, e2->call_stmt);
+         e = e->caller->get_edge (e2->call_stmt);
          gcc_assert (e->speculative && !e->indirect_unknown_callee);
        }
       else
@@ -1181,8 +1117,7 @@ cgraph_speculative_call_info (struct cgraph_edge *e,
   indirect = e2;
 
   reference = NULL;
-  for (i = 0; ipa_ref_list_reference_iterate (&e->caller->ref_list,
-                                             i, ref); i++)
+  for (i = 0; e->caller->iterate_reference (i, ref); i++)
     if (ref->speculative
        && ((ref->stmt && ref->stmt == e->call_stmt)
            || (!ref->stmt && ref->lto_stmt_uid == e->lto_stmt_uid)))
@@ -1197,34 +1132,22 @@ cgraph_speculative_call_info (struct cgraph_edge *e,
   gcc_assert (e && e2 && ref);
 }
 
-/* Redirect callee of E to N.  The function does not update underlying
-   call expression.  */
-
-void
-cgraph_redirect_edge_callee (struct cgraph_edge *e, struct cgraph_node *n)
-{
-  /* Remove from callers list of the current callee.  */
-  cgraph_edge_remove_callee (e);
-
-  /* Insert to callers list of the new callee.  */
-  cgraph_set_edge_callee (e, n);
-}
-
-/* Speculative call EDGE turned out to be direct call to CALLE_DECL.
+/* Speculative call edge turned out to be direct call to CALLE_DECL.
    Remove the speculative call sequence and return edge representing the call.
    It is up to caller to redirect the call as appropriate. */
 
-struct cgraph_edge *
-cgraph_resolve_speculation (struct cgraph_edge *edge, tree callee_decl)
+cgraph_edge *
+cgraph_edge::resolve_speculation (tree callee_decl)
 {
-  struct cgraph_edge *e2;
-  struct ipa_ref *ref;
+  cgraph_edge *edge = this;
+  cgraph_edge *e2;
+  ipa_ref *ref;
 
   gcc_assert (edge->speculative);
-  cgraph_speculative_call_info (edge, e2, edge, ref);
+  edge->speculative_call_info (e2, edge, ref);
   if (!callee_decl
-      || !symtab_semantically_equivalent_p (ref->referred,
-                                           symtab_get_node (callee_decl)))
+      || !ref->referred->semantically_equivalent_p
+          (symtab_node::get (callee_decl)))
     {
       if (dump_file)
        {
@@ -1232,22 +1155,26 @@ cgraph_resolve_speculation (struct cgraph_edge *edge, tree callee_decl)
            {
              fprintf (dump_file, "Speculative indirect call %s/%i => %s/%i has "
                       "turned out to have contradicting known target ",
-                      xstrdup (edge->caller->name ()), edge->caller->order,
-                      xstrdup (e2->callee->name ()), e2->callee->order);
+                      xstrdup_for_dump (edge->caller->name ()),
+                      edge->caller->order,
+                      xstrdup_for_dump (e2->callee->name ()),
+                      e2->callee->order);
              print_generic_expr (dump_file, callee_decl, 0);
              fprintf (dump_file, "\n");
            }
          else
            {
              fprintf (dump_file, "Removing speculative call %s/%i => %s/%i\n",
-                      xstrdup (edge->caller->name ()), edge->caller->order,
-                      xstrdup (e2->callee->name ()), e2->callee->order);
+                      xstrdup_for_dump (edge->caller->name ()),
+                      edge->caller->order,
+                      xstrdup_for_dump (e2->callee->name ()),
+                      e2->callee->order);
            }
        }
     }
   else
     {
-      struct cgraph_edge *tmp = edge;
+      cgraph_edge *tmp = edge;
       if (dump_file)
         fprintf (dump_file, "Speculative call turned into direct call.\n");
       edge = e2;
@@ -1261,60 +1188,61 @@ cgraph_resolve_speculation (struct cgraph_edge *edge, tree callee_decl)
     edge->frequency = CGRAPH_FREQ_MAX;
   edge->speculative = false;
   e2->speculative = false;
-  ipa_remove_reference (ref);
+  ref->remove_reference ();
   if (e2->indirect_unknown_callee || e2->inline_failed)
-    cgraph_remove_edge (e2);
+    e2->remove ();
   else
-    cgraph_remove_node_and_inline_clones (e2->callee, NULL);
+    e2->callee->remove_symbol_and_inline_clones ();
   if (edge->caller->call_site_hash)
     cgraph_update_edge_in_call_site_hash (edge);
   return edge;
 }
 
-/* Make an indirect EDGE with an unknown callee an ordinary edge leading to
+/* Make an indirect edge with an unknown callee an ordinary edge leading to
    CALLEE.  DELTA is an integer constant that is to be added to the this
    pointer (first parameter) to compensate for skipping a thunk adjustment.  */
 
-struct cgraph_edge *
-cgraph_make_edge_direct (struct cgraph_edge *edge, struct cgraph_node *callee)
+cgraph_edge *
+cgraph_edge::make_direct (cgraph_node *callee)
 {
-  gcc_assert (edge->indirect_unknown_callee);
+  cgraph_edge *edge = this;
+  gcc_assert (indirect_unknown_callee);
 
   /* If we are redirecting speculative call, make it non-speculative.  */
-  if (edge->indirect_unknown_callee && edge->speculative)
+  if (indirect_unknown_callee && speculative)
     {
-      edge = cgraph_resolve_speculation (edge, callee->decl);
+      edge = edge->resolve_speculation (callee->decl);
 
       /* On successful speculation just return the pre existing direct edge.  */
-      if (!edge->indirect_unknown_callee)
+      if (!indirect_unknown_callee)
         return edge;
     }
 
-  edge->indirect_unknown_callee = 0;
-  ggc_free (edge->indirect_info);
-  edge->indirect_info = NULL;
+  indirect_unknown_callee = 0;
+  ggc_free (indirect_info);
+  indirect_info = NULL;
 
   /* Get the edge out of the indirect edge list. */
-  if (edge->prev_callee)
-    edge->prev_callee->next_callee = edge->next_callee;
-  if (edge->next_callee)
-    edge->next_callee->prev_callee = edge->prev_callee;
-  if (!edge->prev_callee)
-    edge->caller->indirect_calls = edge->next_callee;
+  if (prev_callee)
+    prev_callee->next_callee = next_callee;
+  if (next_callee)
+    next_callee->prev_callee = prev_callee;
+  if (!prev_callee)
+    caller->indirect_calls = next_callee;
 
   /* Put it into the normal callee list */
-  edge->prev_callee = NULL;
-  edge->next_callee = edge->caller->callees;
-  if (edge->caller->callees)
-    edge->caller->callees->prev_callee = edge;
-  edge->caller->callees = edge;
+  prev_callee = NULL;
+  next_callee = caller->callees;
+  if (caller->callees)
+    caller->callees->prev_callee = edge;
+  caller->callees = edge;
 
   /* Insert to callers list of the new callee.  */
-  cgraph_set_edge_callee (edge, callee);
+  edge->set_callee (callee);
 
-  if (edge->call_stmt)
-    edge->call_stmt_cannot_inline_p
-      = !gimple_check_call_matching_types (edge->call_stmt, callee->decl,
+  if (call_stmt)
+    call_stmt_cannot_inline_p
+      = !gimple_check_call_matching_types (call_stmt, callee->decl,
                                           false);
 
   /* We need to re-determine the inlining status of the edge.  */
@@ -1325,29 +1253,30 @@ cgraph_make_edge_direct (struct cgraph_edge *edge, struct cgraph_node *callee)
 /* If necessary, change the function declaration in the call statement
    associated with E so that it corresponds to the edge callee.  */
 
-gimple
-cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
+gimple *
+cgraph_edge::redirect_call_stmt_to_callee (void)
 {
+  cgraph_edge *e = this;
+
   tree decl = gimple_call_fndecl (e->call_stmt);
-  gimple new_stmt;
+  tree lhs = gimple_call_lhs (e->call_stmt);
+  gcall *new_stmt;
   gimple_stmt_iterator gsi;
-#ifdef ENABLE_CHECKING
-  struct cgraph_node *node;
-#endif
+  bool skip_bounds = false;
 
   if (e->speculative)
     {
-      struct cgraph_edge *e2;
-      gimple new_stmt;
-      struct ipa_ref *ref;
+      cgraph_edge *e2;
+      gcall *new_stmt;
+      ipa_ref *ref;
 
-      cgraph_speculative_call_info (e, e, e2, ref);
+      e->speculative_call_info (e, e2, ref);
       /* If there already is an direct call (i.e. as a result of inliner's
         substitution), forget about speculating.  */
       if (decl)
-       e = cgraph_resolve_speculation (e, decl);
+       e = e->resolve_speculation (decl);
       /* If types do not match, speculation was likely wrong. 
-         The direct edge was posisbly redirected to the clone with a different
+         The direct edge was possibly redirected to the clone with a different
         signature.  We did not update the call statement yet, so compare it 
         with the reference that still points to the proper type.  */
       else if (!gimple_check_call_matching_types (e->call_stmt,
@@ -1357,11 +1286,11 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
          if (dump_file)
            fprintf (dump_file, "Not expanding speculative call of %s/%i -> %s/%i\n"
                     "Type mismatch.\n",
-                    xstrdup (e->caller->name ()),
+                    xstrdup_for_dump (e->caller->name ()),
                     e->caller->order,
-                    xstrdup (e->callee->name ()),
+                    xstrdup_for_dump (e->callee->name ()),
                     e->callee->order);
-         e = cgraph_resolve_speculation (e, NULL);
+         e = e->resolve_speculation ();
          /* We are producing the final function body and will throw away the
             callgraph edges really soon.  Reset the counts/frequencies to
             keep verifier happy in the case of roundoff errors.  */
@@ -1375,15 +1304,16 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
          if (dump_file)
            fprintf (dump_file,
                     "Expanding speculative call of %s/%i -> %s/%i count:"
-                    HOST_WIDEST_INT_PRINT_DEC"\n",
-                    xstrdup (e->caller->name ()),
+                    "%" PRId64"\n",
+                    xstrdup_for_dump (e->caller->name ()),
                     e->caller->order,
-                    xstrdup (e->callee->name ()),
+                    xstrdup_for_dump (e->callee->name ()),
                     e->callee->order,
-                    (HOST_WIDEST_INT)e->count);
+                    (int64_t)e->count);
          gcc_assert (e2->speculative);
          push_cfun (DECL_STRUCT_FUNCTION (e->caller->decl));
-         new_stmt = gimple_ic (e->call_stmt, cgraph (ref->referred),
+         new_stmt = gimple_ic (e->call_stmt,
+                               dyn_cast<cgraph_node *> (ref->referred),
                                e->count || e2->count
                                ?  RDIV (e->count * REG_BR_PROB_BASE,
                                         e->count + e2->count)
@@ -1393,8 +1323,35 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
                                : REG_BR_PROB_BASE / 2,
                                e->count, e->count + e2->count);
          e->speculative = false;
-         cgraph_set_call_stmt_including_clones (e->caller, e->call_stmt,
-                                                new_stmt, false);
+         e->caller->set_call_stmt_including_clones (e->call_stmt, new_stmt,
+                                                    false);
+
+         /* Fix edges for BUILT_IN_CHKP_BNDRET calls attached to the
+            processed call stmt.  */
+         if (gimple_call_with_bounds_p (new_stmt)
+             && gimple_call_lhs (new_stmt)
+             && chkp_retbnd_call_by_val (gimple_call_lhs (e2->call_stmt)))
+           {
+             tree dresult = gimple_call_lhs (new_stmt);
+             tree iresult = gimple_call_lhs (e2->call_stmt);
+             gcall *dbndret = chkp_retbnd_call_by_val (dresult);
+             gcall *ibndret = chkp_retbnd_call_by_val (iresult);
+             struct cgraph_edge *iedge
+               = e2->caller->cgraph_node::get_edge (ibndret);
+             struct cgraph_edge *dedge;
+
+             if (dbndret)
+               {
+                 dedge = iedge->caller->create_edge (iedge->callee,
+                                                     dbndret, e->count,
+                                                     e->frequency);
+                 dedge->frequency = compute_call_stmt_bb_frequency
+                   (dedge->caller->decl, gimple_bb (dedge->call_stmt));
+               }
+             iedge->frequency = compute_call_stmt_bb_frequency
+               (iedge->caller->decl, gimple_bb (iedge->call_stmt));
+           }
+
          e->frequency = compute_call_stmt_bb_frequency
                           (e->caller->decl, gimple_bb (e->call_stmt));
          e2->frequency = compute_call_stmt_bb_frequency
@@ -1411,39 +1368,51 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
        }
     }
 
+  /* We might propagate instrumented function pointer into
+     not instrumented function and vice versa.  In such a
+     case we need to either fix function declaration or
+     remove bounds from call statement.  */
+  if (flag_check_pointer_bounds && e->callee)
+    skip_bounds = chkp_redirect_edge (e);
+
   if (e->indirect_unknown_callee
-      || decl == e->callee->decl)
+      || (decl == e->callee->decl
+         && !skip_bounds))
     return e->call_stmt;
 
-#ifdef ENABLE_CHECKING
-  if (decl)
+  if (flag_checking && decl)
     {
-      node = cgraph_get_node (decl);
+      cgraph_node *node = cgraph_node::get (decl);
       gcc_assert (!node || !node->clone.combined_args_to_skip);
     }
-#endif
 
-  if (cgraph_dump_file)
+  if (symtab->dump_file)
     {
-      fprintf (cgraph_dump_file, "updating call of %s/%i -> %s/%i: ",
-              xstrdup (e->caller->name ()), e->caller->order,
-              xstrdup (e->callee->name ()), e->callee->order);
-      print_gimple_stmt (cgraph_dump_file, e->call_stmt, 0, dump_flags);
+      fprintf (symtab->dump_file, "updating call of %s/%i -> %s/%i: ",
+              xstrdup_for_dump (e->caller->name ()), e->caller->order,
+              xstrdup_for_dump (e->callee->name ()), e->callee->order);
+      print_gimple_stmt (symtab->dump_file, e->call_stmt, 0, dump_flags);
       if (e->callee->clone.combined_args_to_skip)
        {
-         fprintf (cgraph_dump_file, " combined args to skip: ");
-         dump_bitmap (cgraph_dump_file,
+         fprintf (symtab->dump_file, " combined args to skip: ");
+         dump_bitmap (symtab->dump_file,
                       e->callee->clone.combined_args_to_skip);
        }
     }
 
-  if (e->callee->clone.combined_args_to_skip)
+  if (e->callee->clone.combined_args_to_skip
+      || skip_bounds)
     {
       int lp_nr;
 
-      new_stmt
-       = gimple_call_copy_skip_args (e->call_stmt,
-                                     e->callee->clone.combined_args_to_skip);
+      new_stmt = e->call_stmt;
+      if (e->callee->clone.combined_args_to_skip)
+       new_stmt
+         = gimple_call_copy_skip_args (new_stmt,
+                                       e->callee->clone.combined_args_to_skip);
+      if (skip_bounds)
+       new_stmt = chkp_copy_call_skip_bounds (new_stmt);
+
       gimple_call_set_fndecl (new_stmt, e->callee->decl);
       gimple_call_set_fntype (new_stmt, gimple_call_fntype (e->call_stmt));
 
@@ -1452,6 +1421,70 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
        SSA_NAME_DEF_STMT (gimple_vdef (new_stmt)) = new_stmt;
 
       gsi = gsi_for_stmt (e->call_stmt);
+
+      /* For optimized away parameters, add on the caller side
+        before the call
+        DEBUG D#X => parm_Y(D)
+        stmts and associate D#X with parm in decl_debug_args_lookup
+        vector to say for debug info that if parameter parm had been passed,
+        it would have value parm_Y(D).  */
+      if (e->callee->clone.combined_args_to_skip && MAY_HAVE_DEBUG_STMTS)
+       {
+         vec<tree, va_gc> **debug_args
+           = decl_debug_args_lookup (e->callee->decl);
+         tree old_decl = gimple_call_fndecl (e->call_stmt);
+         if (debug_args && old_decl)
+           {
+             tree parm;
+             unsigned i = 0, num;
+             unsigned len = vec_safe_length (*debug_args);
+             unsigned nargs = gimple_call_num_args (e->call_stmt);
+             for (parm = DECL_ARGUMENTS (old_decl), num = 0;
+                  parm && num < nargs;
+                  parm = DECL_CHAIN (parm), num++)
+               if (bitmap_bit_p (e->callee->clone.combined_args_to_skip, num)
+                   && is_gimple_reg (parm))
+                 {
+                   unsigned last = i;
+
+                   while (i < len && (**debug_args)[i] != DECL_ORIGIN (parm))
+                     i += 2;
+                   if (i >= len)
+                     {
+                       i = 0;
+                       while (i < last
+                              && (**debug_args)[i] != DECL_ORIGIN (parm))
+                         i += 2;
+                       if (i >= last)
+                         continue;
+                     }
+                   tree ddecl = (**debug_args)[i + 1];
+                   tree arg = gimple_call_arg (e->call_stmt, num);
+                   if (!useless_type_conversion_p (TREE_TYPE (ddecl),
+                                                   TREE_TYPE (arg)))
+                     {
+                       tree rhs1;
+                       if (!fold_convertible_p (TREE_TYPE (ddecl), arg))
+                         continue;
+                       if (TREE_CODE (arg) == SSA_NAME
+                           && gimple_assign_cast_p (SSA_NAME_DEF_STMT (arg))
+                           && (rhs1
+                               = gimple_assign_rhs1 (SSA_NAME_DEF_STMT (arg)))
+                           && useless_type_conversion_p (TREE_TYPE (ddecl),
+                                                         TREE_TYPE (rhs1)))
+                         arg = rhs1;
+                       else
+                         arg = fold_convert (TREE_TYPE (ddecl), arg);
+                     }
+
+                   gimple *def_temp
+                     = gimple_build_debug_bind (ddecl, unshare_expr (arg),
+                                                e->call_stmt);
+                   gsi_insert_before (&gsi, def_temp, GSI_SAME_STMT);
+                 }
+           }
+       }
+
       gsi_replace (&gsi, new_stmt, false);
       /* We need to defer cleaning EH info on the new statement to
          fixup-cfg.  We may not have dominator information at this point
@@ -1471,12 +1504,42 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
       update_stmt_fn (DECL_STRUCT_FUNCTION (e->caller->decl), new_stmt);
     }
 
-  cgraph_set_call_stmt_including_clones (e->caller, e->call_stmt, new_stmt, false);
+  /* If the call becomes noreturn, remove the LHS if possible.  */
+  if (lhs
+      && (gimple_call_flags (new_stmt) & ECF_NORETURN)
+      && TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (lhs))) == INTEGER_CST)
+    {
+      if (TREE_CODE (lhs) == SSA_NAME)
+       {
+         tree var = create_tmp_reg_fn (DECL_STRUCT_FUNCTION (e->caller->decl),
+                                       TREE_TYPE (lhs), NULL);
+         var = get_or_create_ssa_default_def
+                 (DECL_STRUCT_FUNCTION (e->caller->decl), var);
+         gimple *set_stmt = gimple_build_assign (lhs, var);
+          gsi = gsi_for_stmt (new_stmt);
+         gsi_insert_before_without_update (&gsi, set_stmt, GSI_SAME_STMT);
+         update_stmt_fn (DECL_STRUCT_FUNCTION (e->caller->decl), set_stmt);
+       }
+      gimple_call_set_lhs (new_stmt, NULL_TREE);
+      update_stmt_fn (DECL_STRUCT_FUNCTION (e->caller->decl), new_stmt);
+    }
+
+  /* If new callee has no static chain, remove it.  */
+  if (gimple_call_chain (new_stmt) && !DECL_STATIC_CHAIN (e->callee->decl))
+    {
+      gimple_call_set_chain (new_stmt, NULL);
+      update_stmt_fn (DECL_STRUCT_FUNCTION (e->caller->decl), new_stmt);
+    }
+
+  maybe_remove_unused_call_args (DECL_STRUCT_FUNCTION (e->caller->decl),
+                                new_stmt);
+
+  e->caller->set_call_stmt_including_clones (e->call_stmt, new_stmt, false);
 
-  if (cgraph_dump_file)
+  if (symtab->dump_file)
     {
-      fprintf (cgraph_dump_file, "  updated to:");
-      print_gimple_stmt (cgraph_dump_file, e->call_stmt, 0, dump_flags);
+      fprintf (symtab->dump_file, "  updated to:");
+      print_gimple_stmt (symtab->dump_file, e->call_stmt, 0, dump_flags);
     }
   return new_stmt;
 }
@@ -1488,9 +1551,9 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
    replacement.  */
 
 static void
-cgraph_update_edges_for_call_stmt_node (struct cgraph_node *node,
-                                       gimple old_stmt, tree old_call,
-                                       gimple new_stmt)
+cgraph_update_edges_for_call_stmt_node (cgraph_node *node,
+                                       gimple *old_stmt, tree old_call,
+                                       gimple *new_stmt)
 {
   tree new_call = (new_stmt && is_gimple_call (new_stmt))
                  ? gimple_call_fndecl (new_stmt) : 0;
@@ -1502,25 +1565,34 @@ cgraph_update_edges_for_call_stmt_node (struct cgraph_node *node,
      into different builtin.  */
   if (old_call != new_call)
     {
-      struct cgraph_edge *e = cgraph_edge (node, old_stmt);
-      struct cgraph_edge *ne = NULL;
+      cgraph_edge *e = node->get_edge (old_stmt);
+      cgraph_edge *ne = NULL;
       gcov_type count;
       int frequency;
 
       if (e)
        {
+         /* Keep calls marked as dead dead.  */
+         if (new_stmt && is_gimple_call (new_stmt) && e->callee
+             && DECL_BUILT_IN_CLASS (e->callee->decl) == BUILT_IN_NORMAL
+             && DECL_FUNCTION_CODE (e->callee->decl) == BUILT_IN_UNREACHABLE)
+           {
+              node->get_edge (old_stmt)->set_call_stmt
+                (as_a <gcall *> (new_stmt));
+             return;
+           }
          /* See if the edge is already there and has the correct callee.  It
             might be so because of indirect inlining has already updated
             it.  We also might've cloned and redirected the edge.  */
          if (new_call && e->callee)
            {
-             struct cgraph_node *callee = e->callee;
+             cgraph_node *callee = e->callee;
              while (callee)
                {
                  if (callee->decl == new_call
                      || callee->former_clone_of == new_call)
                    {
-                     cgraph_set_call_stmt (e, new_stmt);
+                     e->set_call_stmt (as_a <gcall *> (new_stmt));
                      return;
                    }
                  callee = callee->clone_of;
@@ -1533,9 +1605,9 @@ cgraph_update_edges_for_call_stmt_node (struct cgraph_node *node,
          count = e->count;
          frequency = e->frequency;
          if (e->indirect_unknown_callee || e->inline_failed)
-           cgraph_remove_edge (e);
+           e->remove ();
          else
-           cgraph_remove_node_and_inline_clones (e->callee, NULL);
+           e->callee->remove_symbol_and_inline_clones ();
        }
       else if (new_call)
        {
@@ -1548,14 +1620,15 @@ cgraph_update_edges_for_call_stmt_node (struct cgraph_node *node,
 
       if (new_call)
        {
-         ne = cgraph_create_edge (node, cgraph_get_create_node (new_call),
-                                  new_stmt, count, frequency);
+         ne = node->create_edge (cgraph_node::get_create (new_call),
+                                 as_a <gcall *> (new_stmt), count,
+                                 frequency);
          gcc_assert (ne->inline_failed);
        }
     }
   /* We only updated the call stmt; update pointer in cgraph edge..  */
   else if (old_stmt != new_stmt)
-    cgraph_set_call_stmt (cgraph_edge (node, old_stmt), new_stmt);
+    node->get_edge (old_stmt)->set_call_stmt (as_a <gcall *> (new_stmt));
 }
 
 /* Update or remove the corresponding cgraph edge if a GIMPLE_CALL
@@ -1563,10 +1636,11 @@ cgraph_update_edges_for_call_stmt_node (struct cgraph_node *node,
    of OLD_STMT before it was updated (updating can happen inplace).  */
 
 void
-cgraph_update_edges_for_call_stmt (gimple old_stmt, tree old_decl, gimple new_stmt)
+cgraph_update_edges_for_call_stmt (gimple *old_stmt, tree old_decl,
+                                  gimple *new_stmt)
 {
-  struct cgraph_node *orig = cgraph_get_node (cfun->decl);
-  struct cgraph_node *node;
+  cgraph_node *orig = cgraph_node::get (cfun->decl);
+  cgraph_node *node;
 
   gcc_checking_assert (orig);
   cgraph_update_edges_for_call_stmt_node (orig, old_stmt, old_decl, new_stmt);
@@ -1592,56 +1666,56 @@ cgraph_update_edges_for_call_stmt (gimple old_stmt, tree old_decl, gimple new_st
 /* Remove all callees from the node.  */
 
 void
-cgraph_node_remove_callees (struct cgraph_node *node)
+cgraph_node::remove_callees (void)
 {
-  struct cgraph_edge *e, *f;
+  cgraph_edge *e, *f;
 
   /* It is sufficient to remove the edges from the lists of callers of
      the callees.  The callee list of the node can be zapped with one
      assignment.  */
-  for (e = node->callees; e; e = f)
+  for (e = callees; e; e = f)
     {
       f = e->next_callee;
-      cgraph_call_edge_removal_hooks (e);
+      symtab->call_edge_removal_hooks (e);
       if (!e->indirect_unknown_callee)
-       cgraph_edge_remove_callee (e);
-      cgraph_free_edge (e);
+       e->remove_callee ();
+      symtab->free_edge (e);
     }
-  for (e = node->indirect_calls; e; e = f)
+  for (e = indirect_calls; e; e = f)
     {
       f = e->next_callee;
-      cgraph_call_edge_removal_hooks (e);
+      symtab->call_edge_removal_hooks (e);
       if (!e->indirect_unknown_callee)
-       cgraph_edge_remove_callee (e);
-      cgraph_free_edge (e);
+       e->remove_callee ();
+      symtab->free_edge (e);
     }
-  node->indirect_calls = NULL;
-  node->callees = NULL;
-  if (node->call_site_hash)
+  indirect_calls = NULL;
+  callees = NULL;
+  if (call_site_hash)
     {
-      htab_delete (node->call_site_hash);
-      node->call_site_hash = NULL;
+      call_site_hash->empty ();
+      call_site_hash = NULL;
     }
 }
 
 /* Remove all callers from the node.  */
 
-static void
-cgraph_node_remove_callers (struct cgraph_node *node)
+void
+cgraph_node::remove_callers (void)
 {
-  struct cgraph_edge *e, *f;
+  cgraph_edge *e, *f;
 
   /* It is sufficient to remove the edges from the lists of callees of
      the callers.  The caller list of the node can be zapped with one
      assignment.  */
-  for (e = node->callers; e; e = f)
+  for (e = callers; e; e = f)
     {
       f = e->next_caller;
-      cgraph_call_edge_removal_hooks (e);
-      cgraph_edge_remove_caller (e);
-      cgraph_free_edge (e);
+      symtab->call_edge_removal_hooks (e);
+      e->remove_caller ();
+      symtab->free_edge (e);
     }
-  node->callers = NULL;
+  callers = NULL;
 }
 
 /* Helper function for cgraph_release_function_body and free_lang_data.
@@ -1651,112 +1725,121 @@ cgraph_node_remove_callers (struct cgraph_node *node)
 void
 release_function_body (tree decl)
 {
-  if (DECL_STRUCT_FUNCTION (decl))
+  function *fn = DECL_STRUCT_FUNCTION (decl);
+  if (fn)
     {
-      push_cfun (DECL_STRUCT_FUNCTION (decl));
-      if (cfun->cfg
-         && current_loops)
+      if (fn->cfg
+         || fn->gimple_df)
        {
-         cfun->curr_properties &= ~PROP_loops;
-         loop_optimizer_finalize ();
-       }
-      if (cfun->gimple_df)
-       {
-         delete_tree_ssa ();
-         delete_tree_cfg_annotations ();
-         cfun->eh = NULL;
-       }
-      if (cfun->cfg)
-       {
-         gcc_assert (dom_computed[0] == DOM_NONE);
-         gcc_assert (dom_computed[1] == DOM_NONE);
-         clear_edges ();
-         cfun->cfg = NULL;
+         if (fn->cfg
+             && loops_for_fn (fn))
+           {
+             fn->curr_properties &= ~PROP_loops;
+             loop_optimizer_finalize (fn);
+           }
+         if (fn->gimple_df)
+           {
+             delete_tree_ssa (fn);
+             delete_tree_cfg_annotations (fn);
+             fn->eh = NULL;
+           }
+         if (fn->cfg)
+           {
+             gcc_assert (!dom_info_available_p (fn, CDI_DOMINATORS));
+             gcc_assert (!dom_info_available_p (fn, CDI_POST_DOMINATORS));
+             clear_edges (fn);
+             fn->cfg = NULL;
+           }
+         if (fn->value_histograms)
+           free_histograms (fn);
        }
-      if (cfun->value_histograms)
-       free_histograms ();
-      pop_cfun ();
       gimple_set_body (decl, NULL);
       /* Struct function hangs a lot of data that would leak if we didn't
          removed all pointers to it.   */
-      ggc_free (DECL_STRUCT_FUNCTION (decl));
+      ggc_free (fn);
       DECL_STRUCT_FUNCTION (decl) = NULL;
     }
   DECL_SAVED_TREE (decl) = NULL;
 }
 
-/* Release memory used to represent body of function NODE.
+/* Release memory used to represent body of function.
    Use this only for functions that are released before being translated to
    target code (i.e. RTL).  Functions that are compiled to RTL and beyond
-   are free'd in final.c via free_after_compilation().  */
+   are free'd in final.c via free_after_compilation().
+   KEEP_ARGUMENTS are useful only if you want to rebuild body as thunk.  */
 
 void
-cgraph_release_function_body (struct cgraph_node *node)
+cgraph_node::release_body (bool keep_arguments)
 {
-  node->ipa_transforms_to_apply.release ();
-  if (!node->used_as_abstract_origin && cgraph_state != CGRAPH_STATE_PARSING)
+  ipa_transforms_to_apply.release ();
+  if (!used_as_abstract_origin && symtab->state != PARSING)
     {
-      DECL_RESULT (node->decl) = NULL;
-      DECL_ARGUMENTS (node->decl) = NULL;
+      DECL_RESULT (decl) = NULL;
+
+      if (!keep_arguments)
+       DECL_ARGUMENTS (decl) = NULL;
     }
-  /* If the node is abstract and needed, then do not clear DECL_INITIAL
-     of its associated function function declaration because it's
+  /* If the node is abstract and needed, then do not clear
+     DECL_INITIAL of its associated function declaration because it's
      needed to emit debug info later.  */
-  if (!node->used_as_abstract_origin && DECL_INITIAL (node->decl))
-    DECL_INITIAL (node->decl) = error_mark_node;
-  release_function_body (node->decl);
-  if (node->lto_file_data)
-    lto_free_function_in_decl_state_for_node (node);
+  if (!used_as_abstract_origin && DECL_INITIAL (decl))
+    DECL_INITIAL (decl) = error_mark_node;
+  release_function_body (decl);
+  if (lto_file_data)
+    {
+      lto_free_function_in_decl_state_for_node (this);
+      lto_file_data = NULL;
+    }
 }
 
-/* Remove the node from cgraph.  */
+/* Remove function from symbol table.  */
 
 void
-cgraph_remove_node (struct cgraph_node *node)
+cgraph_node::remove (void)
 {
-  struct cgraph_node *n;
-  int uid = node->uid;
+  cgraph_node *n;
+  int uid = this->uid;
 
-  cgraph_call_node_removal_hooks (node);
-  cgraph_node_remove_callers (node);
-  cgraph_node_remove_callees (node);
-  node->ipa_transforms_to_apply.release ();
+  symtab->call_cgraph_removal_hooks (this);
+  remove_callers ();
+  remove_callees ();
+  ipa_transforms_to_apply.release ();
 
   /* Incremental inlining access removed nodes stored in the postorder list.
      */
-  node->force_output = false;
-  node->forced_by_abi = false;
-  for (n = node->nested; n; n = n->next_nested)
+  force_output = false;
+  forced_by_abi = false;
+  for (n = nested; n; n = n->next_nested)
     n->origin = NULL;
-  node->nested = NULL;
-  if (node->origin)
+  nested = NULL;
+  if (origin)
     {
-      struct cgraph_node **node2 = &node->origin->nested;
+      cgraph_node **node2 = &origin->nested;
 
-      while (*node2 != node)
+      while (*node2 != this)
        node2 = &(*node2)->next_nested;
-      *node2 = node->next_nested;
+      *node2 = next_nested;
     }
-  symtab_unregister_node (node);
-  if (node->prev_sibling_clone)
-    node->prev_sibling_clone->next_sibling_clone = node->next_sibling_clone;
-  else if (node->clone_of)
-    node->clone_of->clones = node->next_sibling_clone;
-  if (node->next_sibling_clone)
-    node->next_sibling_clone->prev_sibling_clone = node->prev_sibling_clone;
-  if (node->clones)
+  unregister ();
+  if (prev_sibling_clone)
+    prev_sibling_clone->next_sibling_clone = next_sibling_clone;
+  else if (clone_of)
+    clone_of->clones = next_sibling_clone;
+  if (next_sibling_clone)
+    next_sibling_clone->prev_sibling_clone = prev_sibling_clone;
+  if (clones)
     {
-      struct cgraph_node *n, *next;
+      cgraph_node *n, *next;
 
-      if (node->clone_of)
+      if (clone_of)
         {
-         for (n = node->clones; n->next_sibling_clone; n = n->next_sibling_clone)
-           n->clone_of = node->clone_of;
-         n->clone_of = node->clone_of;
-         n->next_sibling_clone = node->clone_of->clones;
-         if (node->clone_of->clones)
-           node->clone_of->clones->prev_sibling_clone = n;
-         node->clone_of->clones = node->clones;
+         for (n = clones; n->next_sibling_clone; n = n->next_sibling_clone)
+           n->clone_of = clone_of;
+         n->clone_of = clone_of;
+         n->next_sibling_clone = clone_of->clones;
+         if (clone_of->clones)
+           clone_of->clones->prev_sibling_clone = n;
+         clone_of->clones = clones;
        }
       else
         {
@@ -1765,7 +1848,7 @@ cgraph_remove_node (struct cgraph_node *node)
             tree intact.  This can happen in unreachable function removal since
             we remove unreachable functions in random order, not by bottom-up
             walk of clone trees.  */
-         for (n = node->clones; n; n = next)
+         for (n = clones; n; n = next)
            {
               next = n->next_sibling_clone;
               n->next_sibling_clone = NULL;
@@ -1779,47 +1862,51 @@ cgraph_remove_node (struct cgraph_node *node)
      itself is kept in the cgraph even after it is compiled.  Check whether
      we are done with this body and reclaim it proactively if this is the case.
      */
-  if (cgraph_state != CGRAPH_LTO_STREAMING)
+  if (symtab->state != LTO_STREAMING)
     {
-      n = cgraph_get_node (node->decl);
+      n = cgraph_node::get (decl);
       if (!n
          || (!n->clones && !n->clone_of && !n->global.inlined_to
-             && (cgraph_global_info_ready
+             && ((symtab->global_info_ready || in_lto_p)
                  && (TREE_ASM_WRITTEN (n->decl)
                      || DECL_EXTERNAL (n->decl)
                      || !n->analyzed
                      || (!flag_wpa && n->in_other_partition)))))
-       cgraph_release_function_body (node);
+       release_body ();
+    }
+  else
+    {
+      lto_free_function_in_decl_state_for_node (this);
+      lto_file_data = NULL;
     }
 
-  node->decl = NULL;
-  if (node->call_site_hash)
+  decl = NULL;
+  if (call_site_hash)
     {
-      htab_delete (node->call_site_hash);
-      node->call_site_hash = NULL;
+      call_site_hash->empty ();
+      call_site_hash = NULL;
     }
-  cgraph_n_nodes--;
 
-  /* Clear out the node to NULL all pointers and add the node to the free
-     list.  */
-  memset (node, 0, sizeof (*node));
-  node->type = SYMTAB_FUNCTION;
-  node->uid = uid;
-  SET_NEXT_FREE_NODE (node, free_nodes);
-  free_nodes = node;
+  if (instrumented_version)
+    {
+      instrumented_version->instrumented_version = NULL;
+      instrumented_version = NULL;
+    }
+
+  symtab->release_symbol (this, uid);
 }
 
 /* Likewise indicate that a node is having address taken.  */
 
 void
-cgraph_mark_address_taken_node (struct cgraph_node *node)
+cgraph_node::mark_address_taken (void)
 {
   /* Indirect inlining can figure out that all uses of the address are
      inlined.  */
-  if (node->global.inlined_to)
+  if (global.inlined_to)
     {
       gcc_assert (cfun->after_inlining);
-      gcc_assert (node->callers->indirect_inlining_edge);
+      gcc_assert (callers->indirect_inlining_edge);
       return;
     }
   /* FIXME: address_taken flag is used both as a shortcut for testing whether
@@ -1828,53 +1915,40 @@ cgraph_mark_address_taken_node (struct cgraph_node *node)
      of the object was taken (and thus it should be set on node alias is
      referring to).  We should remove the first use and the remove the
      following set.  */
-  node->address_taken = 1;
-  node = cgraph_function_or_thunk_node (node, NULL);
+  address_taken = 1;
+  cgraph_node *node = ultimate_alias_target ();
   node->address_taken = 1;
 }
 
 /* Return local info for the compiled function.  */
 
-struct cgraph_local_info *
-cgraph_local_info (tree decl)
+cgraph_local_info *
+cgraph_node::local_info (tree decl)
 {
-  struct cgraph_node *node;
-
   gcc_assert (TREE_CODE (decl) == FUNCTION_DECL);
-  node = cgraph_get_node (decl);
+  cgraph_node *node = get (decl);
   if (!node)
     return NULL;
-  return &node->local;
+  return &node->ultimate_alias_target ()->local;
 }
 
 /* Return local info for the compiled function.  */
 
-struct cgraph_global_info *
-cgraph_global_info (tree decl)
+cgraph_rtl_info *
+cgraph_node::rtl_info (tree decl)
 {
-  struct cgraph_node *node;
-
-  gcc_assert (TREE_CODE (decl) == FUNCTION_DECL && cgraph_global_info_ready);
-  node = cgraph_get_node (decl);
+  gcc_assert (TREE_CODE (decl) == FUNCTION_DECL);
+  cgraph_node *node = get (decl);
   if (!node)
     return NULL;
-  return &node->global;
-}
-
-/* Return local info for the compiled function.  */
-
-struct cgraph_rtl_info *
-cgraph_rtl_info (tree decl)
-{
-  struct cgraph_node *node;
-
-  gcc_assert (TREE_CODE (decl) == FUNCTION_DECL);
-  node = cgraph_get_node (decl);
-  if (!node
-      || (decl != current_function_decl
-         && !TREE_ASM_WRITTEN (node->decl)))
+  node = node->ultimate_alias_target ();
+  if (node->decl != current_function_decl
+      && !TREE_ASM_WRITTEN (node->decl))
     return NULL;
-  return &node->rtl;
+  /* Allocate if it doesnt exist.  */
+  if (node->ultimate_alias_target ()->rtl == NULL)
+    node->ultimate_alias_target ()->rtl = ggc_cleared_alloc<cgraph_rtl_info> ();
+  return node->ultimate_alias_target ()->rtl;
 }
 
 /* Return a string describing the failure REASON.  */
@@ -1917,206 +1991,237 @@ cgraph_inline_failed_type (cgraph_inline_failed_t reason)
 const char * const cgraph_availability_names[] =
   {"unset", "not_available", "overwritable", "available", "local"};
 
+/* Output flags of edge to a file F.  */
+
+void
+cgraph_edge::dump_edge_flags (FILE *f)
+{
+  if (speculative)
+    fprintf (f, "(speculative) ");
+  if (!inline_failed)
+    fprintf (f, "(inlined) ");
+  if (indirect_inlining_edge)
+    fprintf (f, "(indirect_inlining) ");
+  if (count)
+    fprintf (f, "(%" PRId64"x) ", (int64_t)count);
+  if (frequency)
+    fprintf (f, "(%.2f per call) ", frequency / (double)CGRAPH_FREQ_BASE);
+  if (can_throw_external)
+    fprintf (f, "(can throw external) ");
+}
 
-/* Dump call graph node NODE to file F.  */
+/* Dump call graph node to file F.  */
 
 void
-dump_cgraph_node (FILE *f, struct cgraph_node *node)
+cgraph_node::dump (FILE *f)
 {
-  struct cgraph_edge *edge;
-  int indirect_calls_count = 0;
+  cgraph_edge *edge;
 
-  dump_symtab_base (f, node);
+  dump_base (f);
 
-  if (node->global.inlined_to)
+  if (global.inlined_to)
     fprintf (f, "  Function %s/%i is inline copy in %s/%i\n",
-            xstrdup (node->name ()),
-            node->order,
-            xstrdup (node->global.inlined_to->name ()),
-            node->global.inlined_to->order);
-  if (node->clone_of)
+            xstrdup_for_dump (name ()),
+            order,
+            xstrdup_for_dump (global.inlined_to->name ()),
+            global.inlined_to->order);
+  if (clone_of)
     fprintf (f, "  Clone of %s/%i\n",
-            node->clone_of->asm_name (),
-            node->clone_of->order);
-  if (cgraph_function_flags_ready)
+            clone_of->asm_name (),
+            clone_of->order);
+  if (symtab->function_flags_ready)
     fprintf (f, "  Availability: %s\n",
-            cgraph_availability_names [cgraph_function_body_availability (node)]);
+            cgraph_availability_names [get_availability ()]);
 
-  if (node->profile_id)
+  if (profile_id)
     fprintf (f, "  Profile id: %i\n",
-            node->profile_id);
-  fprintf (f, "  First run: %i\n", node->tp_first_run);
+            profile_id);
+  fprintf (f, "  First run: %i\n", tp_first_run);
   fprintf (f, "  Function flags:");
-  if (node->count)
-    fprintf (f, " executed "HOST_WIDEST_INT_PRINT_DEC"x",
-            (HOST_WIDEST_INT)node->count);
-  if (node->origin)
-    fprintf (f, " nested in: %s", node->origin->asm_name ());
-  if (gimple_has_body_p (node->decl))
+  if (count)
+    fprintf (f, " executed %" PRId64"x",
+            (int64_t)count);
+  if (origin)
+    fprintf (f, " nested in: %s", origin->asm_name ());
+  if (gimple_has_body_p (decl))
     fprintf (f, " body");
-  if (node->process)
+  if (process)
     fprintf (f, " process");
-  if (node->local.local)
+  if (local.local)
     fprintf (f, " local");
-  if (node->local.redefined_extern_inline)
+  if (local.redefined_extern_inline)
     fprintf (f, " redefined_extern_inline");
-  if (node->only_called_at_startup)
+  if (only_called_at_startup)
     fprintf (f, " only_called_at_startup");
-  if (node->only_called_at_exit)
+  if (only_called_at_exit)
     fprintf (f, " only_called_at_exit");
-  if (node->tm_clone)
+  if (tm_clone)
     fprintf (f, " tm_clone");
+  if (icf_merged)
+    fprintf (f, " icf_merged");
+  if (merged_comdat)
+    fprintf (f, " merged_comdat");
+  if (nonfreeing_fn)
+    fprintf (f, " nonfreeing_fn");
+  if (DECL_STATIC_CONSTRUCTOR (decl))
+    fprintf (f," static_constructor (priority:%i)", get_init_priority ());
+  if (DECL_STATIC_DESTRUCTOR (decl))
+    fprintf (f," static_destructor (priority:%i)", get_fini_priority ());
+  if (frequency == NODE_FREQUENCY_HOT)
+    fprintf (f, " hot");
+  if (frequency == NODE_FREQUENCY_UNLIKELY_EXECUTED)
+    fprintf (f, " unlikely_executed");
+  if (frequency == NODE_FREQUENCY_EXECUTED_ONCE)
+    fprintf (f, " executed_once");
+  if (only_called_at_startup)
+    fprintf (f, " only_called_at_startup");
+  if (only_called_at_exit)
+    fprintf (f, " only_called_at_exit");
+  if (opt_for_fn (decl, optimize_size))
+    fprintf (f, " optimize_size");
+  if (parallelized_function)
+    fprintf (f, " parallelized_function");
 
   fprintf (f, "\n");
 
-  if (node->thunk.thunk_p)
+  if (thunk.thunk_p)
     {
       fprintf (f, "  Thunk");
-      if (node->thunk.alias)
+      if (thunk.alias)
         fprintf (f, "  of %s (asm: %s)",
-                lang_hooks.decl_printable_name (node->thunk.alias, 2),
-                IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (node->thunk.alias)));
+                lang_hooks.decl_printable_name (thunk.alias, 2),
+                IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (thunk.alias)));
       fprintf (f, " fixed offset %i virtual value %i has "
               "virtual offset %i)\n",
-              (int)node->thunk.fixed_offset,
-              (int)node->thunk.virtual_value,
-              (int)node->thunk.virtual_offset_p);
+              (int)thunk.fixed_offset,
+              (int)thunk.virtual_value,
+              (int)thunk.virtual_offset_p);
     }
-  if (node->alias && node->thunk.alias
-      && DECL_P (node->thunk.alias))
+  if (alias && thunk.alias
+      && DECL_P (thunk.alias))
     {
       fprintf (f, "  Alias of %s",
-              lang_hooks.decl_printable_name (node->thunk.alias, 2));
-      if (DECL_ASSEMBLER_NAME_SET_P (node->thunk.alias))
+              lang_hooks.decl_printable_name (thunk.alias, 2));
+      if (DECL_ASSEMBLER_NAME_SET_P (thunk.alias))
         fprintf (f, " (asm: %s)",
-                IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (node->thunk.alias)));
+                IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (thunk.alias)));
       fprintf (f, "\n");
     }
   
   fprintf (f, "  Called by: ");
 
-  for (edge = node->callers; edge; edge = edge->next_caller)
+  for (edge = callers; edge; edge = edge->next_caller)
     {
       fprintf (f, "%s/%i ", edge->caller->asm_name (),
               edge->caller->order);
-      if (edge->count)
-       fprintf (f, "("HOST_WIDEST_INT_PRINT_DEC"x) ",
-                (HOST_WIDEST_INT)edge->count);
-      if (edge->frequency)
-       fprintf (f, "(%.2f per call) ",
-                edge->frequency / (double)CGRAPH_FREQ_BASE);
-      if (edge->speculative)
-       fprintf (f, "(speculative) ");
-      if (!edge->inline_failed)
-       fprintf (f, "(inlined) ");
-      if (edge->indirect_inlining_edge)
-       fprintf (f, "(indirect_inlining) ");
-      if (edge->can_throw_external)
-       fprintf (f, "(can throw external) ");
+      edge->dump_edge_flags (f);
     }
 
   fprintf (f, "\n  Calls: ");
-  for (edge = node->callees; edge; edge = edge->next_callee)
+  for (edge = callees; edge; edge = edge->next_callee)
     {
       fprintf (f, "%s/%i ", edge->callee->asm_name (),
               edge->callee->order);
-      if (edge->speculative)
-       fprintf (f, "(speculative) ");
-      if (!edge->inline_failed)
-       fprintf (f, "(inlined) ");
-      if (edge->indirect_inlining_edge)
-       fprintf (f, "(indirect_inlining) ");
-      if (edge->count)
-       fprintf (f, "("HOST_WIDEST_INT_PRINT_DEC"x) ",
-                (HOST_WIDEST_INT)edge->count);
-      if (edge->frequency)
-       fprintf (f, "(%.2f per call) ",
-                edge->frequency / (double)CGRAPH_FREQ_BASE);
-      if (edge->can_throw_external)
-       fprintf (f, "(can throw external) ");
+      edge->dump_edge_flags (f);
     }
   fprintf (f, "\n");
 
-  for (edge = node->indirect_calls; edge; edge = edge->next_callee)
-    indirect_calls_count++;
-  if (indirect_calls_count)
-    fprintf (f, "  Has %i outgoing edges for indirect calls.\n",
-            indirect_calls_count);
-}
+  for (edge = indirect_calls; edge; edge = edge->next_callee)
+    {
+      if (edge->indirect_info->polymorphic)
+       {
+          fprintf (f, "   Polymorphic indirect call of type ");
+         print_generic_expr (f, edge->indirect_info->otr_type, TDF_SLIM);
+         fprintf (f, " token:%i", (int) edge->indirect_info->otr_token);
+       }
+      else
+        fprintf (f, "   Indirect call");
+      edge->dump_edge_flags (f);
+      if (edge->indirect_info->param_index != -1)
+       {
+         fprintf (f, " of param:%i", edge->indirect_info->param_index);
+         if (edge->indirect_info->agg_contents)
+          fprintf (f, " loaded from %s %s at offset %i",
+                   edge->indirect_info->member_ptr ? "member ptr" : "aggregate",
+                   edge->indirect_info->by_ref ? "passed by reference":"",
+                   (int)edge->indirect_info->offset);
+         if (edge->indirect_info->vptr_changed)
+           fprintf (f, " (vptr maybe changed)");
+       }
+      fprintf (f, "\n");
+      if (edge->indirect_info->polymorphic)
+       edge->indirect_info->context.dump (f);
+    }
 
+  if (instrumentation_clone)
+    fprintf (f, "  Is instrumented version.\n");
+  else if (instrumented_version)
+    fprintf (f, "  Has instrumented version.\n");
+}
 
 /* Dump call graph node NODE to stderr.  */
 
 DEBUG_FUNCTION void
-debug_cgraph_node (struct cgraph_node *node)
+cgraph_node::debug (void)
 {
-  dump_cgraph_node (stderr, node);
+  dump (stderr);
 }
 
-
 /* Dump the callgraph to file F.  */
 
 void
-dump_cgraph (FILE *f)
+cgraph_node::dump_cgraph (FILE *f)
 {
-  struct cgraph_node *node;
+  cgraph_node *node;
 
   fprintf (f, "callgraph:\n\n");
   FOR_EACH_FUNCTION (node)
-    dump_cgraph_node (f, node);
-}
-
-
-/* Dump the call graph to stderr.  */
-
-DEBUG_FUNCTION void
-debug_cgraph (void)
-{
-  dump_cgraph (stderr);
+    node->dump (f);
 }
 
 /* Return true when the DECL can possibly be inlined.  */
+
 bool
 cgraph_function_possibly_inlined_p (tree decl)
 {
-  if (!cgraph_global_info_ready)
+  if (!symtab->global_info_ready)
     return !DECL_UNINLINABLE (decl);
   return DECL_POSSIBLY_INLINED (decl);
 }
 
-/* NODE is no longer nested function; update cgraph accordingly.  */
+/* cgraph_node is no longer nested function; update cgraph accordingly.  */
 void
-cgraph_unnest_node (struct cgraph_node *node)
+cgraph_node::unnest (void)
 {
-  struct cgraph_node **node2 = &node->origin->nested;
-  gcc_assert (node->origin);
+  cgraph_node **node2 = &origin->nested;
+  gcc_assert (origin);
 
-  while (*node2 != node)
+  while (*node2 != this)
     node2 = &(*node2)->next_nested;
-  *node2 = node->next_nested;
-  node->origin = NULL;
+  *node2 = next_nested;
+  origin = NULL;
 }
 
 /* Return function availability.  See cgraph.h for description of individual
    return values.  */
 enum availability
-cgraph_function_body_availability (struct cgraph_node *node)
+cgraph_node::get_availability (void)
 {
   enum availability avail;
-  if (!node->analyzed)
+  if (!analyzed)
     avail = AVAIL_NOT_AVAILABLE;
-  else if (node->local.local)
+  else if (local.local)
     avail = AVAIL_LOCAL;
-  else if (node->alias && node->weakref)
-    cgraph_function_or_thunk_node (node, &avail);
-  else if (lookup_attribute ("ifunc", DECL_ATTRIBUTES (node->decl)))
-    avail = AVAIL_OVERWRITABLE;
-  else if (!node->externally_visible)
+  else if (transparent_alias)
+    ultimate_alias_target (&avail);
+  else if (lookup_attribute ("ifunc", DECL_ATTRIBUTES (decl)))
+    avail = AVAIL_INTERPOSABLE;
+  else if (!externally_visible)
     avail = AVAIL_AVAILABLE;
   /* Inline functions are safe to be analyzed even if their symbol can
      be overwritten at runtime.  It is not meaningful to enforce any sane
      behaviour on replacing inline function by different body.  */
-  else if (DECL_DECLARED_INLINE_P (node->decl))
+  else if (DECL_DECLARED_INLINE_P (decl))
     avail = AVAIL_AVAILABLE;
 
   /* If the function can be overwritten, return OVERWRITABLE.  Take
@@ -2129,9 +2234,8 @@ cgraph_function_body_availability (struct cgraph_node *node)
      AVAIL_AVAILABLE here?  That would be good reason to preserve this
      bit.  */
 
-  else if (decl_replaceable_p (node->decl)
-          && !DECL_EXTERNAL (node->decl))
-    avail = AVAIL_OVERWRITABLE;
+  else if (decl_replaceable_p (decl) && !DECL_EXTERNAL (decl))
+    avail = AVAIL_INTERPOSABLE;
   else avail = AVAIL_AVAILABLE;
 
   return avail;
@@ -2139,130 +2243,106 @@ cgraph_function_body_availability (struct cgraph_node *node)
 
 /* Worker for cgraph_node_can_be_local_p.  */
 static bool
-cgraph_node_cannot_be_local_p_1 (struct cgraph_node *node,
-                                void *data ATTRIBUTE_UNUSED)
+cgraph_node_cannot_be_local_p_1 (cgraph_node *node, void *)
 {
   return !(!node->force_output
           && ((DECL_COMDAT (node->decl)
                && !node->forced_by_abi
-               && !symtab_used_from_object_file_p (node)
+               && !node->used_from_object_file_p ()
                && !node->same_comdat_group)
               || !node->externally_visible));
 }
 
-/* Return true if NODE can be made local for API change.
+/* Return true if cgraph_node can be made local for API change.
    Extern inline functions and C++ COMDAT functions can be made local
    at the expense of possible code size growth if function is used in multiple
    compilation units.  */
 bool
-cgraph_node_can_be_local_p (struct cgraph_node *node)
+cgraph_node::can_be_local_p (void)
 {
-  return (!node->address_taken
-         && !cgraph_for_node_and_aliases (node,
-                                          cgraph_node_cannot_be_local_p_1,
-                                          NULL, true));
+  return (!address_taken
+         && !call_for_symbol_thunks_and_aliases (cgraph_node_cannot_be_local_p_1,
+                                               NULL, true));
 }
 
-/* Call calback on NODE, thunks and aliases associated to NODE. 
+/* Call callback on cgraph_node, thunks and aliases associated to cgraph_node.
    When INCLUDE_OVERWRITABLE is false, overwritable aliases and thunks are
-   skipped. */
-
+   skipped.  When EXCLUDE_VIRTUAL_THUNKS is true, virtual thunks are
+   skipped.  */
 bool
-cgraph_for_node_thunks_and_aliases (struct cgraph_node *node,
-                                   bool (*callback) (struct cgraph_node *, void *),
-                                   void *data,
-                                   bool include_overwritable)
+cgraph_node::call_for_symbol_thunks_and_aliases (bool (*callback)
+                                                  (cgraph_node *, void *),
+                                                void *data,
+                                                bool include_overwritable,
+                                                bool exclude_virtual_thunks)
 {
-  struct cgraph_edge *e;
-  int i;
-  struct ipa_ref *ref;
+  cgraph_edge *e;
+  ipa_ref *ref;
 
-  if (callback (node, data))
+  if (callback (this, data))
     return true;
-  for (e = node->callers; e; e = e->next_caller)
+  FOR_EACH_ALIAS (this, ref)
+    {
+      cgraph_node *alias = dyn_cast <cgraph_node *> (ref->referring);
+      if (include_overwritable
+         || alias->get_availability () > AVAIL_INTERPOSABLE)
+       if (alias->call_for_symbol_thunks_and_aliases (callback, data,
+                                                    include_overwritable,
+                                                    exclude_virtual_thunks))
+         return true;
+    }
+  for (e = callers; e; e = e->next_caller)
     if (e->caller->thunk.thunk_p
        && (include_overwritable
-           || cgraph_function_body_availability (e->caller) > AVAIL_OVERWRITABLE))
-      if (cgraph_for_node_thunks_and_aliases (e->caller, callback, data,
-                                             include_overwritable))
+           || e->caller->get_availability () > AVAIL_INTERPOSABLE)
+       && !(exclude_virtual_thunks
+            && e->caller->thunk.virtual_offset_p))
+      if (e->caller->call_for_symbol_thunks_and_aliases (callback, data,
+                                                      include_overwritable,
+                                                      exclude_virtual_thunks))
        return true;
-  for (i = 0; ipa_ref_list_referring_iterate (&node->ref_list, i, ref); i++)
-    if (ref->use == IPA_REF_ALIAS)
-      {
-       struct cgraph_node *alias = ipa_ref_referring_node (ref);
-       if (include_overwritable
-           || cgraph_function_body_availability (alias) > AVAIL_OVERWRITABLE)
-         if (cgraph_for_node_thunks_and_aliases (alias, callback, data,
-                                                 include_overwritable))
-           return true;
-      }
-  return false;
-}
-
-/* Call calback on NODE and aliases associated to NODE. 
-   When INCLUDE_OVERWRITABLE is false, overwritable aliases and thunks are
-   skipped. */
-
-bool
-cgraph_for_node_and_aliases (struct cgraph_node *node,
-                            bool (*callback) (struct cgraph_node *, void *),
-                            void *data,
-                            bool include_overwritable)
-{
-  int i;
-  struct ipa_ref *ref;
 
-  if (callback (node, data))
-    return true;
-  for (i = 0; ipa_ref_list_referring_iterate (&node->ref_list, i, ref); i++)
-    if (ref->use == IPA_REF_ALIAS)
-      {
-       struct cgraph_node *alias = ipa_ref_referring_node (ref);
-       if (include_overwritable
-           || cgraph_function_body_availability (alias) > AVAIL_OVERWRITABLE)
-          if (cgraph_for_node_and_aliases (alias, callback, data,
-                                          include_overwritable))
-           return true;
-      }
   return false;
 }
 
 /* Worker to bring NODE local.  */
 
-static bool
-cgraph_make_node_local_1 (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED)
+bool
+cgraph_node::make_local (cgraph_node *node, void *)
 {
-  gcc_checking_assert (cgraph_node_can_be_local_p (node));
+  gcc_checking_assert (node->can_be_local_p ());
   if (DECL_COMDAT (node->decl) || DECL_EXTERNAL (node->decl))
     {
-      symtab_make_decl_local (node->decl);
-
+      node->make_decl_local ();
+      node->set_section (NULL);
+      node->set_comdat_group (NULL);
       node->externally_visible = false;
       node->forced_by_abi = false;
       node->local.local = true;
-      node->unique_name = (node->resolution == LDPR_PREVAILING_DEF_IRONLY
-                                 || node->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP);
+      node->set_section (NULL);
+      node->unique_name = ((node->resolution == LDPR_PREVAILING_DEF_IRONLY
+                          || node->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP)
+                          && !flag_incremental_link);
       node->resolution = LDPR_PREVAILING_DEF_IRONLY;
-      gcc_assert (cgraph_function_body_availability (node) == AVAIL_LOCAL);
+      gcc_assert (node->get_availability () == AVAIL_LOCAL);
     }
   return false;
 }
 
-/* Bring NODE local.  */
+/* Bring cgraph node local.  */
 
 void
-cgraph_make_node_local (struct cgraph_node *node)
+cgraph_node::make_local (void)
 {
-  cgraph_for_node_thunks_and_aliases (node, cgraph_make_node_local_1,
-                                     NULL, true);
+  call_for_symbol_thunks_and_aliases (cgraph_node::make_local, NULL, true);
 }
 
 /* Worker to set nothrow flag.  */
 
 static bool
-cgraph_set_nothrow_flag_1 (struct cgraph_node *node, void *data)
+cgraph_set_nothrow_flag_1 (cgraph_node *node, void *data)
 {
-  struct cgraph_edge *e;
+  cgraph_edge *e;
 
   TREE_NOTHROW (node->decl) = data != NULL;
 
@@ -2276,16 +2356,16 @@ cgraph_set_nothrow_flag_1 (struct cgraph_node *node, void *data)
    if any to NOTHROW.  */
 
 void
-cgraph_set_nothrow_flag (struct cgraph_node *node, bool nothrow)
+cgraph_node::set_nothrow_flag (bool nothrow)
 {
-  cgraph_for_node_thunks_and_aliases (node, cgraph_set_nothrow_flag_1,
-                                     (void *)(size_t)nothrow, false);
+  call_for_symbol_thunks_and_aliases (cgraph_set_nothrow_flag_1,
+                                   (void *)(size_t)nothrow, false);
 }
 
 /* Worker to set const flag.  */
 
 static bool
-cgraph_set_const_flag_1 (struct cgraph_node *node, void *data)
+cgraph_set_const_flag_1 (cgraph_node *node, void *data)
 {
   /* Static constructors and destructors without a side effect can be
      optimized out.  */
@@ -2301,21 +2381,21 @@ cgraph_set_const_flag_1 (struct cgraph_node *node, void *data)
   return false;
 }
 
-/* Set TREE_READONLY on NODE's decl and on aliases of NODE
+/* Set TREE_READONLY on cgraph_node's decl and on aliases of the node
    if any to READONLY.  */
 
 void
-cgraph_set_const_flag (struct cgraph_node *node, bool readonly, bool looping)
+cgraph_node::set_const_flag (bool readonly, bool looping)
 {
-  cgraph_for_node_thunks_and_aliases (node, cgraph_set_const_flag_1,
-                                     (void *)(size_t)(readonly + (int)looping * 2),
-                                     false);
+  call_for_symbol_thunks_and_aliases (cgraph_set_const_flag_1,
+                                   (void *)(size_t)(readonly + (int)looping * 2),
+                                   false, true);
 }
 
 /* Worker to set pure flag.  */
 
 static bool
-cgraph_set_pure_flag_1 (struct cgraph_node *node, void *data)
+cgraph_set_pure_flag_1 (cgraph_node *node, void *data)
 {
   /* Static constructors and destructors without a side effect can be
      optimized out.  */
@@ -2331,110 +2411,158 @@ cgraph_set_pure_flag_1 (struct cgraph_node *node, void *data)
   return false;
 }
 
-/* Set DECL_PURE_P on NODE's decl and on aliases of NODE
+/* Set DECL_PURE_P on cgraph_node's decl and on aliases of the node
    if any to PURE.  */
 
 void
-cgraph_set_pure_flag (struct cgraph_node *node, bool pure, bool looping)
+cgraph_node::set_pure_flag (bool pure, bool looping)
 {
-  cgraph_for_node_thunks_and_aliases (node, cgraph_set_pure_flag_1,
-                                     (void *)(size_t)(pure + (int)looping * 2),
-                                     false);
+  call_for_symbol_thunks_and_aliases (cgraph_set_pure_flag_1,
+                                   (void *)(size_t)(pure + (int)looping * 2),
+                                   false, true);
 }
 
-/* Return true when NODE can not return or throw and thus
+/* Return true when cgraph_node can not return or throw and thus
    it is safe to ignore its side effects for IPA analysis.  */
 
 bool
-cgraph_node_cannot_return (struct cgraph_node *node)
+cgraph_node::cannot_return_p (void)
 {
-  int flags = flags_from_decl_or_type (node->decl);
-  if (!flag_exceptions)
+  int flags = flags_from_decl_or_type (decl);
+  if (!opt_for_fn (decl, flag_exceptions))
     return (flags & ECF_NORETURN) != 0;
   else
     return ((flags & (ECF_NORETURN | ECF_NOTHROW))
             == (ECF_NORETURN | ECF_NOTHROW));
 }
 
-/* Return true when call of E can not lead to return from caller
+/* Return true when call of edge can not lead to return from caller
    and thus it is safe to ignore its side effects for IPA analysis
    when computing side effects of the caller.
    FIXME: We could actually mark all edges that have no reaching
    patch to the exit block or throw to get better results.  */
 bool
-cgraph_edge_cannot_lead_to_return (struct cgraph_edge *e)
+cgraph_edge::cannot_lead_to_return_p (void)
 {
-  if (cgraph_node_cannot_return (e->caller))
+  if (caller->cannot_return_p ())
     return true;
-  if (e->indirect_unknown_callee)
+  if (indirect_unknown_callee)
     {
-      int flags = e->indirect_info->ecf_flags;
-      if (!flag_exceptions)
+      int flags = indirect_info->ecf_flags;
+      if (!opt_for_fn (caller->decl, flag_exceptions))
        return (flags & ECF_NORETURN) != 0;
       else
        return ((flags & (ECF_NORETURN | ECF_NOTHROW))
                 == (ECF_NORETURN | ECF_NOTHROW));
     }
   else
-    return cgraph_node_cannot_return (e->callee);
+    return callee->cannot_return_p ();
 }
 
-/* Return true when function NODE can be removed from callgraph
-   if all direct calls are eliminated.  */
+/* Return true if the call can be hot.  */
 
 bool
-cgraph_can_remove_if_no_direct_calls_and_refs_p (struct cgraph_node *node)
+cgraph_edge::maybe_hot_p (void)
 {
-  gcc_assert (!node->global.inlined_to);
-  /* Extern inlines can always go, we will use the external definition.  */
-  if (DECL_EXTERNAL (node->decl))
-    return true;
-  /* When function is needed, we can not remove it.  */
-  if (node->force_output || node->used_from_other_partition)
+  /* TODO: Export profile_status from cfun->cfg to cgraph_node.  */
+  if (profile_info
+      && opt_for_fn (caller->decl, flag_branch_probabilities)
+      && !maybe_hot_count_p (NULL, count))
+    return false;
+  if (caller->frequency == NODE_FREQUENCY_UNLIKELY_EXECUTED
+      || (callee
+         && callee->frequency == NODE_FREQUENCY_UNLIKELY_EXECUTED))
+    return false;
+  if (caller->frequency > NODE_FREQUENCY_UNLIKELY_EXECUTED
+      && (callee
+         && callee->frequency <= NODE_FREQUENCY_EXECUTED_ONCE))
     return false;
-  if (DECL_STATIC_CONSTRUCTOR (node->decl)
-      || DECL_STATIC_DESTRUCTOR (node->decl))
+  if (opt_for_fn (caller->decl, optimize_size))
     return false;
-  /* Only COMDAT functions can be removed if externally visible.  */
-  if (node->externally_visible
-      && (!DECL_COMDAT (node->decl)
-         || node->forced_by_abi
-         || symtab_used_from_object_file_p (node)))
+  if (caller->frequency == NODE_FREQUENCY_HOT)
+    return true;
+  if (caller->frequency == NODE_FREQUENCY_EXECUTED_ONCE
+      && frequency < CGRAPH_FREQ_BASE * 3 / 2)
     return false;
+  if (opt_for_fn (caller->decl, flag_guess_branch_prob))
+    {
+      if (PARAM_VALUE (HOT_BB_FREQUENCY_FRACTION) == 0
+         || frequency <= (CGRAPH_FREQ_BASE
+                          / PARAM_VALUE (HOT_BB_FREQUENCY_FRACTION)))
+        return false;
+    }
   return true;
 }
 
 /* Worker for cgraph_can_remove_if_no_direct_calls_p.  */
 
 static bool
-nonremovable_p (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED)
+nonremovable_p (cgraph_node *node, void *)
 {
-  return !cgraph_can_remove_if_no_direct_calls_and_refs_p (node);
+  return !node->can_remove_if_no_direct_calls_and_refs_p ();
 }
 
-/* Return true when function NODE and its aliases can be removed from callgraph
-   if all direct calls are eliminated.  */
+/* Return true if whole comdat group can be removed if there are no direct
+   calls to THIS.  */
 
 bool
-cgraph_can_remove_if_no_direct_calls_p (struct cgraph_node *node)
+cgraph_node::can_remove_if_no_direct_calls_p (bool will_inline)
 {
-  /* Extern inlines can always go, we will use the external definition.  */
-  if (DECL_EXTERNAL (node->decl))
-    return true;
-  if (node->address_taken)
+  struct ipa_ref *ref;
+
+  /* For local symbols or non-comdat group it is the same as 
+     can_remove_if_no_direct_calls_p.  */
+  if (!externally_visible || !same_comdat_group)
+    {
+      if (DECL_EXTERNAL (decl))
+       return true;
+      if (address_taken)
+       return false;
+      return !call_for_symbol_and_aliases (nonremovable_p, NULL, true);
+    }
+
+  if (will_inline && address_taken)
     return false;
-  return !cgraph_for_node_and_aliases (node, nonremovable_p, NULL, true);
-}
 
-/* Worker for cgraph_can_remove_if_no_direct_calls_p.  */
+  /* Otheriwse check if we can remove the symbol itself and then verify
+     that only uses of the comdat groups are direct call to THIS
+     or its aliases.   */
+  if (!can_remove_if_no_direct_calls_and_refs_p ())
+    return false;
 
-static bool
-used_from_object_file_p (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED)
-{
-  return symtab_used_from_object_file_p (node);
+  /* Check that all refs come from within the comdat group.  */
+  for (int i = 0; iterate_referring (i, ref); i++)
+    if (ref->referring->get_comdat_group () != get_comdat_group ())
+      return false;
+
+  struct cgraph_node *target = ultimate_alias_target ();
+  for (cgraph_node *next = dyn_cast<cgraph_node *> (same_comdat_group);
+       next != this; next = dyn_cast<cgraph_node *> (next->same_comdat_group))
+    {
+      if (!externally_visible)
+       continue;
+      if (!next->alias
+         && !next->can_remove_if_no_direct_calls_and_refs_p ())
+       return false;
+
+      /* If we see different symbol than THIS, be sure to check calls.  */
+      if (next->ultimate_alias_target () != target)
+       for (cgraph_edge *e = next->callers; e; e = e->next_caller)
+         if (e->caller->get_comdat_group () != get_comdat_group ()
+             || will_inline)
+           return false;
+
+      /* If function is not being inlined, we care only about
+        references outside of the comdat group.  */
+      if (!will_inline)
+        for (int i = 0; next->iterate_referring (i, ref); i++)
+         if (ref->referring->get_comdat_group () != get_comdat_group ())
+           return false;
+    }
+  return true;
 }
 
-/* Return true when function NODE can be expected to be removed
+/* Return true when function cgraph_node can be expected to be removed
    from program when direct calls in this compilation unit are removed.
 
    As a special case COMDAT functions are
@@ -2449,40 +2577,70 @@ used_from_object_file_p (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED)
    linkonce section.  */
 
 bool
-cgraph_will_be_removed_from_program_if_no_direct_calls (struct cgraph_node *node)
+cgraph_node::will_be_removed_from_program_if_no_direct_calls_p
+        (bool will_inline)
 {
-  gcc_assert (!node->global.inlined_to);
-  if (cgraph_for_node_and_aliases (node, used_from_object_file_p, NULL, true))
-    return false;
+  gcc_assert (!global.inlined_to);
+  if (DECL_EXTERNAL (decl))
+    return true;
+
   if (!in_lto_p && !flag_whole_program)
-    return cgraph_only_called_directly_p (node);
-  else
     {
-       if (DECL_EXTERNAL (node->decl))
-         return true;
-      return cgraph_can_remove_if_no_direct_calls_p (node);
+      /* If the symbol is in comdat group, we need to verify that whole comdat
+        group becomes unreachable.  Technically we could skip references from
+        within the group, too.  */
+      if (!only_called_directly_p ())
+       return false;
+      if (same_comdat_group && externally_visible)
+       {
+         struct cgraph_node *target = ultimate_alias_target ();
+
+         if (will_inline && address_taken)
+           return true;
+         for (cgraph_node *next = dyn_cast<cgraph_node *> (same_comdat_group);
+              next != this;
+              next = dyn_cast<cgraph_node *> (next->same_comdat_group))
+           {
+             if (!externally_visible)
+               continue;
+             if (!next->alias
+                 && !next->only_called_directly_p ())
+               return false;
+
+             /* If we see different symbol than THIS,
+                be sure to check calls.  */
+             if (next->ultimate_alias_target () != target)
+               for (cgraph_edge *e = next->callers; e; e = e->next_caller)
+                 if (e->caller->get_comdat_group () != get_comdat_group ()
+                     || will_inline)
+                   return false;
+           }
+       }
+      return true;
     }
+  else
+    return can_remove_if_no_direct_calls_p (will_inline);
 }
 
 
 /* Worker for cgraph_only_called_directly_p.  */
 
 static bool
-cgraph_not_only_called_directly_p_1 (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED)
+cgraph_not_only_called_directly_p_1 (cgraph_node *node, void *)
 {
-  return !cgraph_only_called_directly_or_aliased_p (node);
+  return !node->only_called_directly_or_aliased_p ();
 }
 
-/* Return true when function NODE and all its aliases are only called
+/* Return true when function cgraph_node and all its aliases are only called
    directly.
    i.e. it is not externally visible, address was not taken and
    it is not used in any other non-standard way.  */
 
 bool
-cgraph_only_called_directly_p (struct cgraph_node *node)
+cgraph_node::only_called_directly_p (void)
 {
-  gcc_assert (cgraph_function_or_thunk_node (node, NULL) == node);
-  return !cgraph_for_node_and_aliases (node, cgraph_not_only_called_directly_p_1,
+  gcc_assert (ultimate_alias_target () == this);
+  return !call_for_symbol_and_aliases (cgraph_not_only_called_directly_p_1,
                                       NULL, true);
 }
 
@@ -2490,89 +2648,98 @@ cgraph_only_called_directly_p (struct cgraph_node *node)
 /* Collect all callers of NODE.  Worker for collect_callers_of_node.  */
 
 static bool
-collect_callers_of_node_1 (struct cgraph_node *node, void *data)
+collect_callers_of_node_1 (cgraph_node *node, void *data)
 {
-  vec<cgraph_edge_p> *redirect_callers = (vec<cgraph_edge_p> *)data;
-  struct cgraph_edge *cs;
+  vec<cgraph_edge *> *redirect_callers = (vec<cgraph_edge *> *)data;
+  cgraph_edge *cs;
   enum availability avail;
-  cgraph_function_or_thunk_node (node, &avail);
+  node->ultimate_alias_target (&avail);
 
-  if (avail > AVAIL_OVERWRITABLE)
+  if (avail > AVAIL_INTERPOSABLE)
     for (cs = node->callers; cs != NULL; cs = cs->next_caller)
-      if (!cs->indirect_inlining_edge)
+      if (!cs->indirect_inlining_edge
+         && !cs->caller->thunk.thunk_p)
         redirect_callers->safe_push (cs);
   return false;
 }
 
-/* Collect all callers of NODE and its aliases that are known to lead to NODE
-   (i.e. are not overwritable).  */
+/* Collect all callers of cgraph_node and its aliases that are known to lead to
+   cgraph_node (i.e. are not overwritable).  */
 
-vec<cgraph_edge_p> 
-collect_callers_of_node (struct cgraph_node *node)
+vec<cgraph_edge *>
+cgraph_node::collect_callers (void)
 {
-  vec<cgraph_edge_p> redirect_callers = vNULL;
-  cgraph_for_node_and_aliases (node, collect_callers_of_node_1,
-                              &redirect_callers, false);
+  vec<cgraph_edge *> redirect_callers = vNULL;
+  call_for_symbol_thunks_and_aliases (collect_callers_of_node_1,
+                                   &redirect_callers, false);
   return redirect_callers;
 }
 
-/* Return TRUE if NODE2 is equivalent to NODE or its clone.  */
+/* Return TRUE if NODE2 a clone of NODE or is equivalent to it.  */
+
 static bool
-clone_of_p (struct cgraph_node *node, struct cgraph_node *node2)
+clone_of_p (cgraph_node *node, cgraph_node *node2)
 {
-  node = cgraph_function_or_thunk_node (node, NULL);
-  node2 = cgraph_function_or_thunk_node (node2, NULL);
+  bool skipped_thunk = false;
+  node = node->ultimate_alias_target ();
+  node2 = node2->ultimate_alias_target ();
+
+  /* There are no virtual clones of thunks so check former_clone_of or if we
+     might have skipped thunks because this adjustments are no longer
+     necessary.  */
+  while (node->thunk.thunk_p)
+    {
+      if (node2->former_clone_of == node->decl)
+       return true;
+      if (!node->thunk.this_adjusting)
+       return false;
+      node = node->callees->callee->ultimate_alias_target ();
+      skipped_thunk = true;
+    }
+
+  if (skipped_thunk)
+    {
+      if (!node2->clone.args_to_skip
+         || !bitmap_bit_p (node2->clone.args_to_skip, 0))
+       return false;
+      if (node2->former_clone_of == node->decl)
+       return true;
+      else if (!node2->clone_of)
+       return false;
+    }
+
   while (node != node2 && node2)
     node2 = node2->clone_of;
   return node2 != NULL;
 }
 
-/* Verify edge count and frequency.  */
+/* Verify edge count and frequency.  */
 
-static bool
-verify_edge_count_and_frequency (struct cgraph_edge *e)
+bool
+cgraph_edge::verify_count_and_frequency ()
 {
   bool error_found = false;
-  if (e->count < 0)
+  if (count < 0)
     {
       error ("caller edge count is negative");
       error_found = true;
     }
-  if (e->frequency < 0)
+  if (frequency < 0)
     {
       error ("caller edge frequency is negative");
       error_found = true;
     }
-  if (e->frequency > CGRAPH_FREQ_MAX)
+  if (frequency > CGRAPH_FREQ_MAX)
     {
       error ("caller edge frequency is too large");
       error_found = true;
     }
-  if (gimple_has_body_p (e->caller->decl)
-      && !e->caller->global.inlined_to
-      && !e->speculative
-      /* FIXME: Inline-analysis sets frequency to 0 when edge is optimized out.
-        Remove this once edges are actually removed from the function at that time.  */
-      && (e->frequency
-         || (inline_edge_summary_vec.exists ()
-             && ((inline_edge_summary_vec.length () <= (unsigned) e->uid)
-                 || !inline_edge_summary (e)->predicate)))
-      && (e->frequency
-         != compute_call_stmt_bb_frequency (e->caller->decl,
-                                            gimple_bb (e->call_stmt))))
-    {
-      error ("caller edge frequency %i does not match BB frequency %i",
-            e->frequency,
-            compute_call_stmt_bb_frequency (e->caller->decl,
-                                            gimple_bb (e->call_stmt)));
-      error_found = true;
-    }
   return error_found;
 }
 
 /* Switch to THIS_CFUN if needed and print STMT to stderr.  */
 static void
-cgraph_debug_gimple_stmt (struct function *this_cfun, gimple stmt)
+cgraph_debug_gimple_stmt (function *this_cfun, gimple *stmt)
 {
   bool fndecl_was_null = false;
   /* debug_gimple_stmt needs correct cfun */
@@ -2589,19 +2756,19 @@ cgraph_debug_gimple_stmt (struct function *this_cfun, gimple stmt)
     current_function_decl = NULL;
 }
 
-/* Verify that call graph edge corresponds to DECL from the associated
+/* Verify that call graph edge corresponds to DECL from the associated
    statement.  Return true if the verification should fail.  */
 
-static bool
-verify_edge_corresponds_to_fndecl (struct cgraph_edge *e, tree decl)
+bool
+cgraph_edge::verify_corresponds_to_fndecl (tree decl)
 {
-  struct cgraph_node *node;
+  cgraph_node *node;
 
-  if (!decl || e->callee->global.inlined_to)
+  if (!decl || callee->global.inlined_to)
     return false;
-  if (cgraph_state == CGRAPH_LTO_STREAMING)
+  if (symtab->state == LTO_STREAMING)
     return false;
-  node = cgraph_get_node (decl);
+  node = cgraph_node::get (decl);
 
   /* We do not know if a node from a different partition is an alias or what it
      aliases and therefore cannot do the former_clone_of check reliably.  When
@@ -2610,21 +2777,21 @@ verify_edge_corresponds_to_fndecl (struct cgraph_edge *e, tree decl)
   if (!node
       || node->body_removed
       || node->in_other_partition
-      || e->callee->in_other_partition)
+      || callee->icf_merged
+      || callee->in_other_partition)
     return false;
 
+  node = node->ultimate_alias_target ();
+
   /* Optimizers can redirect unreachable calls or calls triggering undefined
      behaviour to builtin_unreachable.  */
-  if (DECL_BUILT_IN_CLASS (e->callee->decl) == BUILT_IN_NORMAL
-      && DECL_FUNCTION_CODE (e->callee->decl) == BUILT_IN_UNREACHABLE)
+  if (DECL_BUILT_IN_CLASS (callee->decl) == BUILT_IN_NORMAL
+      && DECL_FUNCTION_CODE (callee->decl) == BUILT_IN_UNREACHABLE)
     return false;
-  node = cgraph_function_or_thunk_node (node, NULL);
 
-  if (e->callee->former_clone_of != node->decl
-      /* IPA-CP sometimes redirect edge to clone and then back to the former
-        function.  This ping-pong has to go, eventually.  */
-      && (node != cgraph_function_or_thunk_node (e->callee, NULL))
-      && !clone_of_p (cgraph_function_or_thunk_node (node, NULL), e->callee))
+  if (callee->former_clone_of != node->decl
+      && (node != callee->ultimate_alias_target ())
+      && !clone_of_p (node, callee))
     return true;
   else
     return false;
@@ -2632,10 +2799,10 @@ verify_edge_corresponds_to_fndecl (struct cgraph_edge *e, tree decl)
 
 /* Verify cgraph nodes of given cgraph node.  */
 DEBUG_FUNCTION void
-verify_cgraph_node (struct cgraph_node *node)
+cgraph_node::verify_node (void)
 {
-  struct cgraph_edge *e;
-  struct function *this_cfun = DECL_STRUCT_FUNCTION (node->decl);
+  cgraph_edge *e;
+  function *this_cfun = DECL_STRUCT_FUNCTION (decl);
   basic_block this_block;
   gimple_stmt_iterator gsi;
   bool error_found = false;
@@ -2644,8 +2811,8 @@ verify_cgraph_node (struct cgraph_node *node)
     return;
 
   timevar_push (TV_CGRAPH_VERIFY);
-  error_found |= verify_symtab_base (node);
-  for (e = node->callees; e; e = e->next_callee)
+  error_found |= verify_base ();
+  for (e = callees; e; e = e->next_callee)
     if (e->aux)
       {
        error ("aux field set for edge %s->%s",
@@ -2653,37 +2820,37 @@ verify_cgraph_node (struct cgraph_node *node)
               identifier_to_locale (e->callee->name ()));
        error_found = true;
       }
-  if (node->count < 0)
+  if (count < 0)
     {
       error ("execution count is negative");
       error_found = true;
     }
-  if (node->global.inlined_to && node->same_comdat_group)
+  if (global.inlined_to && same_comdat_group)
     {
       error ("inline clone in same comdat group list");
       error_found = true;
     }
-  if (!node->definition && !node->in_other_partition && node->local.local)
+  if (!definition && !in_other_partition && local.local)
     {
       error ("local symbols must be defined");
       error_found = true;
     }
-  if (node->global.inlined_to && node->externally_visible)
+  if (global.inlined_to && externally_visible)
     {
       error ("externally visible inline clone");
       error_found = true;
     }
-  if (node->global.inlined_to && node->address_taken)
+  if (global.inlined_to && address_taken)
     {
       error ("inline clone with address taken");
       error_found = true;
     }
-  if (node->global.inlined_to && node->force_output)
+  if (global.inlined_to && force_output)
     {
       error ("inline clone is forced to output");
       error_found = true;
     }
-  for (e = node->indirect_calls; e; e = e->next_callee)
+  for (e = indirect_calls; e; e = e->next_callee)
     {
       if (e->aux)
        {
@@ -2701,13 +2868,13 @@ verify_cgraph_node (struct cgraph_node *node)
          error_found = true;
        }
     }
-  bool check_comdat = symtab_comdat_local_p (node);
-  for (e = node->callers; e; e = e->next_caller)
+  bool check_comdat = comdat_local_p ();
+  for (e = callers; e; e = e->next_caller)
     {
-      if (verify_edge_count_and_frequency (e))
+      if (e->verify_count_and_frequency ())
        error_found = true;
       if (check_comdat
-         && !symtab_in_same_comdat_p (e->caller, node))
+         && !in_same_comdat_group_p (e->caller))
        {
          error ("comdat-local function called by %s outside its comdat",
                 identifier_to_locale (e->caller->name ()));
@@ -2715,94 +2882,132 @@ verify_cgraph_node (struct cgraph_node *node)
        }
       if (!e->inline_failed)
        {
-         if (node->global.inlined_to
+         if (global.inlined_to
              != (e->caller->global.inlined_to
                  ? e->caller->global.inlined_to : e->caller))
            {
              error ("inlined_to pointer is wrong");
              error_found = true;
            }
-         if (node->callers->next_caller)
+         if (callers->next_caller)
            {
              error ("multiple inline callers");
              error_found = true;
            }
        }
       else
-       if (node->global.inlined_to)
+       if (global.inlined_to)
          {
            error ("inlined_to pointer set for noninline callers");
            error_found = true;
          }
     }
-  for (e = node->indirect_calls; e; e = e->next_callee)
-    if (verify_edge_count_and_frequency (e))
-      error_found = true;
-  if (!node->callers && node->global.inlined_to)
+  for (e = callees; e; e = e->next_callee)
+    {
+      if (e->verify_count_and_frequency ())
+       error_found = true;
+      if (gimple_has_body_p (e->caller->decl)
+         && !e->caller->global.inlined_to
+         && !e->speculative
+         /* Optimized out calls are redirected to __builtin_unreachable.  */
+         && (e->frequency
+             || e->callee->decl
+                != builtin_decl_implicit (BUILT_IN_UNREACHABLE))
+         && (e->frequency
+             != compute_call_stmt_bb_frequency (e->caller->decl,
+                                                gimple_bb (e->call_stmt))))
+       {
+         error ("caller edge frequency %i does not match BB frequency %i",
+                e->frequency,
+                compute_call_stmt_bb_frequency (e->caller->decl,
+                                                gimple_bb (e->call_stmt)));
+         error_found = true;
+       }
+    }
+  for (e = indirect_calls; e; e = e->next_callee)
+    {
+      if (e->verify_count_and_frequency ())
+       error_found = true;
+      if (gimple_has_body_p (e->caller->decl)
+         && !e->caller->global.inlined_to
+         && !e->speculative
+         && (e->frequency
+             != compute_call_stmt_bb_frequency (e->caller->decl,
+                                                gimple_bb (e->call_stmt))))
+       {
+         error ("indirect call frequency %i does not match BB frequency %i",
+                e->frequency,
+                compute_call_stmt_bb_frequency (e->caller->decl,
+                                                gimple_bb (e->call_stmt)));
+         error_found = true;
+       }
+    }
+  if (!callers && global.inlined_to)
     {
       error ("inlined_to pointer is set but no predecessors found");
       error_found = true;
     }
-  if (node->global.inlined_to == node)
+  if (global.inlined_to == this)
     {
       error ("inlined_to pointer refers to itself");
       error_found = true;
     }
 
-  if (node->clone_of)
+  if (clone_of)
     {
-      struct cgraph_node *n;
-      for (n = node->clone_of->clones; n; n = n->next_sibling_clone)
-        if (n == node)
+      cgraph_node *n;
+      for (n = clone_of->clones; n; n = n->next_sibling_clone)
+       if (n == this)
          break;
       if (!n)
        {
-         error ("node has wrong clone_of");
+         error ("cgraph_node has wrong clone_of");
          error_found = true;
        }
     }
-  if (node->clones)
+  if (clones)
     {
-      struct cgraph_node *n;
-      for (n = node->clones; n; n = n->next_sibling_clone)
-        if (n->clone_of != node)
+      cgraph_node *n;
+      for (n = clones; n; n = n->next_sibling_clone)
+       if (n->clone_of != this)
          break;
       if (n)
        {
-         error ("node has wrong clone list");
+         error ("cgraph_node has wrong clone list");
          error_found = true;
        }
     }
-  if ((node->prev_sibling_clone || node->next_sibling_clone) && !node->clone_of)
+  if ((prev_sibling_clone || next_sibling_clone) && !clone_of)
     {
-       error ("node is in clone list but it is not clone");
+       error ("cgraph_node is in clone list but it is not clone");
        error_found = true;
     }
-  if (!node->prev_sibling_clone && node->clone_of && node->clone_of->clones != node)
+  if (!prev_sibling_clone && clone_of && clone_of->clones != this)
     {
-      error ("node has wrong prev_clone pointer");
+      error ("cgraph_node has wrong prev_clone pointer");
       error_found = true;
     }
-  if (node->prev_sibling_clone && node->prev_sibling_clone->next_sibling_clone != node)
+  if (prev_sibling_clone && prev_sibling_clone->next_sibling_clone != this)
     {
       error ("double linked list of clones corrupted");
       error_found = true;
     }
 
-  if (node->analyzed && node->alias)
+  if (analyzed && alias)
     {
       bool ref_found = false;
       int i;
-      struct ipa_ref *ref;
+      ipa_ref *ref = NULL;
 
-      if (node->callees)
+      if (callees)
        {
          error ("Alias has call edges");
           error_found = true;
        }
-      for (i = 0; ipa_ref_list_reference_iterate (&node->ref_list,
-                                                 i, ref); i++)
-       if (ref->use != IPA_REF_ALIAS)
+      for (i = 0; iterate_reference (i, ref); i++)
+       if (ref->use == IPA_REF_CHKP)
+         ;
+       else if (ref->use != IPA_REF_ALIAS)
          {
            error ("Alias has non-alias reference");
            error_found = true;
@@ -2814,40 +3019,118 @@ verify_cgraph_node (struct cgraph_node *node)
          }
        else
          ref_found = true;
-       if (!ref_found)
+      if (!ref_found)
+       {
+         error ("Analyzed alias has no reference");
+         error_found = true;
+       }
+    }
+
+  /* Check instrumented version reference.  */
+  if (instrumented_version
+      && instrumented_version->instrumented_version != this)
+    {
+      error ("Instrumentation clone does not reference original node");
+      error_found = true;
+    }
+
+  /* Cannot have orig_decl for not instrumented nodes.  */
+  if (!instrumentation_clone && orig_decl)
+    {
+      error ("Not instrumented node has non-NULL original declaration");
+      error_found = true;
+    }
+
+  /* If original not instrumented node still exists then we may check
+     original declaration is set properly.  */
+  if (instrumented_version
+      && orig_decl
+      && orig_decl != instrumented_version->decl)
+    {
+      error ("Instrumented node has wrong original declaration");
+      error_found = true;
+    }
+
+  /* Check all nodes have chkp reference to their instrumented versions.  */
+  if (analyzed
+      && instrumented_version
+      && !instrumentation_clone)
+    {
+      bool ref_found = false;
+      int i;
+      struct ipa_ref *ref;
+
+      for (i = 0; iterate_reference (i, ref); i++)
+       if (ref->use == IPA_REF_CHKP)
          {
-           error ("Analyzed alias has no reference");
-           error_found = true;
+           if (ref_found)
+             {
+               error ("Node has more than one chkp reference");
+               error_found = true;
+             }
+           if (ref->referred != instrumented_version)
+             {
+               error ("Wrong node is referenced with chkp reference");
+               error_found = true;
+             }
+           ref_found = true;
          }
+
+      if (!ref_found)
+       {
+         error ("Analyzed node has no reference to instrumented version");
+         error_found = true;
+       }
+    }
+
+  if (instrumentation_clone
+      && DECL_BUILT_IN_CLASS (decl) == NOT_BUILT_IN)
+    {
+      tree name = DECL_ASSEMBLER_NAME (decl);
+      tree orig_name = DECL_ASSEMBLER_NAME (orig_decl);
+
+      if (!IDENTIFIER_TRANSPARENT_ALIAS (name)
+         || TREE_CHAIN (name) != orig_name)
+       {
+         error ("Alias chain for instrumented node is broken");
+         error_found = true;
+       }
     }
-  if (node->analyzed && node->thunk.thunk_p)
+
+  if (analyzed && thunk.thunk_p)
     {
-      if (!node->callees)
+      if (!callees)
        {
          error ("No edge out of thunk node");
           error_found = true;
        }
-      else if (node->callees->next_callee)
+      else if (callees->next_callee)
        {
          error ("More than one edge out of thunk node");
           error_found = true;
        }
-      if (gimple_has_body_p (node->decl))
+      if (gimple_has_body_p (decl))
         {
          error ("Thunk is not supposed to have body");
           error_found = true;
         }
+      if (thunk.add_pointer_bounds_args
+         && !instrumented_version->semantically_equivalent_p (callees->callee))
+       {
+         error ("Instrumentation thunk has wrong edge callee");
+          error_found = true;
+       }
     }
-  else if (node->analyzed && gimple_has_body_p (node->decl)
-           && !TREE_ASM_WRITTEN (node->decl)
-           && (!DECL_EXTERNAL (node->decl) || node->global.inlined_to)
-           && !flag_wpa)
+  else if (analyzed && gimple_has_body_p (decl)
+          && !TREE_ASM_WRITTEN (decl)
+          && (!DECL_EXTERNAL (decl) || global.inlined_to)
+          && !flag_wpa)
     {
       if (this_cfun->cfg)
        {
-         pointer_set_t *stmts = pointer_set_create ();
+         hash_set<gimple *> stmts;
          int i;
-         struct ipa_ref *ref;
+         ipa_ref *ref = NULL;
 
          /* Reach the trees by walking over the CFG, and note the
             enclosing basic-blocks in the call edges.  */
@@ -2855,16 +3138,16 @@ verify_cgraph_node (struct cgraph_node *node)
            {
              for (gsi = gsi_start_phis (this_block);
                   !gsi_end_p (gsi); gsi_next (&gsi))
-               pointer_set_insert (stmts, gsi_stmt (gsi));
+               stmts.add (gsi_stmt (gsi));
              for (gsi = gsi_start_bb (this_block);
                   !gsi_end_p (gsi);
                   gsi_next (&gsi))
                {
-                 gimple stmt = gsi_stmt (gsi);
-                 pointer_set_insert (stmts, stmt);
+                 gimple *stmt = gsi_stmt (gsi);
+                 stmts.add (stmt);
                  if (is_gimple_call (stmt))
                    {
-                     struct cgraph_edge *e = cgraph_edge (node, stmt);
+                     cgraph_edge *e = get_edge (stmt);
                      tree decl = gimple_call_fndecl (stmt);
                      if (e)
                        {
@@ -2876,7 +3159,7 @@ verify_cgraph_node (struct cgraph_node *node)
                            }
                          if (!e->indirect_unknown_callee)
                            {
-                             if (verify_edge_corresponds_to_fndecl (e, decl))
+                             if (e->verify_corresponds_to_fndecl (decl))
                                {
                                  error ("edge points to wrong declaration:");
                                  debug_tree (e->callee->decl);
@@ -2904,22 +3187,19 @@ verify_cgraph_node (struct cgraph_node *node)
                    }
                }
              }
-           for (i = 0;
-                ipa_ref_list_reference_iterate (&node->ref_list, i, ref);
-                i++)
-             if (ref->stmt && !pointer_set_contains (stmts, ref->stmt))
+           for (i = 0; iterate_reference (i, ref); i++)
+             if (ref->stmt && !stmts.contains (ref->stmt))
                {
                  error ("reference to dead statement");
                  cgraph_debug_gimple_stmt (this_cfun, ref->stmt);
                  error_found = true;
                }
-           pointer_set_destroy (stmts);
        }
       else
        /* No CFG available?!  */
        gcc_unreachable ();
 
-      for (e = node->callees; e; e = e->next_callee)
+      for (e = callees; e; e = e->next_callee)
        {
          if (!e->aux)
            {
@@ -2931,7 +3211,7 @@ verify_cgraph_node (struct cgraph_node *node)
            }
          e->aux = 0;
        }
-      for (e = node->indirect_calls; e; e = e->next_callee)
+      for (e = indirect_calls; e; e = e->next_callee)
        {
          if (!e->aux && !e->speculative)
            {
@@ -2945,7 +3225,7 @@ verify_cgraph_node (struct cgraph_node *node)
     }
   if (error_found)
     {
-      dump_cgraph_node (stderr, node);
+      dump (stderr);
       internal_error ("verify_cgraph_node failed");
     }
   timevar_pop (TV_CGRAPH_VERIFY);
@@ -2953,90 +3233,176 @@ verify_cgraph_node (struct cgraph_node *node)
 
 /* Verify whole cgraph structure.  */
 DEBUG_FUNCTION void
-verify_cgraph (void)
+cgraph_node::verify_cgraph_nodes (void)
 {
-  struct cgraph_node *node;
+  cgraph_node *node;
 
   if (seen_error ())
     return;
 
   FOR_EACH_FUNCTION (node)
-    verify_cgraph_node (node);
+    node->verify ();
 }
 
-/* Given NODE, walk the alias chain to return the function NODE is alias of.
-   Walk through thunk, too.
+/* Walk the alias chain to return the function cgraph_node is alias of.
+   Walk through thunks, too.
    When AVAILABILITY is non-NULL, get minimal availability in the chain.  */
 
-struct cgraph_node *
-cgraph_function_node (struct cgraph_node *node, enum availability *availability)
+cgraph_node *
+cgraph_node::function_symbol (enum availability *availability)
 {
-  do
+  cgraph_node *node = ultimate_alias_target (availability);
+
+  while (node->thunk.thunk_p)
     {
-      node = cgraph_function_or_thunk_node (node, availability);
-      if (node->thunk.thunk_p)
+      node = node->callees->callee;
+      if (availability)
        {
-         node = node->callees->callee;
-         if (availability)
-           {
-             enum availability a;
-             a = cgraph_function_body_availability (node);
-             if (a < *availability)
-               *availability = a;
-           }
-         node = cgraph_function_or_thunk_node (node, availability);
+         enum availability a;
+         a = node->get_availability ();
+         if (a < *availability)
+           *availability = a;
+       }
+      node = node->ultimate_alias_target (availability);
+    }
+  return node;
+}
+
+/* Walk the alias chain to return the function cgraph_node is alias of.
+   Walk through non virtual thunks, too.  Thus we return either a function
+   or a virtual thunk node.
+   When AVAILABILITY is non-NULL, get minimal availability in the chain.  */
+
+cgraph_node *
+cgraph_node::function_or_virtual_thunk_symbol
+                               (enum availability *availability)
+{
+  cgraph_node *node = ultimate_alias_target (availability);
+
+  while (node->thunk.thunk_p && !node->thunk.virtual_offset_p)
+    {
+      node = node->callees->callee;
+      if (availability)
+       {
+         enum availability a;
+         a = node->get_availability ();
+         if (a < *availability)
+           *availability = a;
        }
-    } while (node && node->thunk.thunk_p);
+      node = node->ultimate_alias_target (availability);
+    }
   return node;
 }
 
-/* When doing LTO, read NODE's body from disk if it is not already present.  */
+/* When doing LTO, read cgraph_node's body from disk if it is not already
+   present.  */
 
 bool
-cgraph_get_body (struct cgraph_node *node)
+cgraph_node::get_untransformed_body (void)
 {
-  struct lto_file_decl_data *file_data;
+  lto_file_decl_data *file_data;
   const char *data, *name;
   size_t len;
-  tree decl = node->decl;
+  tree decl = this->decl;
 
   if (DECL_RESULT (decl))
     return false;
 
   gcc_assert (in_lto_p);
 
-  file_data = node->lto_file_data;
+  timevar_push (TV_IPA_LTO_GIMPLE_IN);
+
+  file_data = lto_file_data;
   name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
 
   /* We may have renamed the declaration, e.g., a static function.  */
   name = lto_get_decl_name_mapping (file_data, name);
+  struct lto_in_decl_state *decl_state
+        = lto_get_function_in_decl_state (file_data, decl);
 
   data = lto_get_section_data (file_data, LTO_section_function_body,
-                              name, &len);
+                              name, &len, decl_state->compressed);
   if (!data)
-    {
-       dump_cgraph_node (stderr, node);
-    fatal_error ("%s: section %s is missing",
+    fatal_error (input_location, "%s: section %s is missing",
                 file_data->file_name,
                 name);
-    }
 
   gcc_assert (DECL_STRUCT_FUNCTION (decl) == NULL);
 
-  lto_input_function_body (file_data, node, data);
+  lto_input_function_body (file_data, this, data);
   lto_stats.num_function_bodies++;
   lto_free_section_data (file_data, LTO_section_function_body, name,
-                        data, len);
-  lto_free_function_in_decl_state_for_node (node);
+                        data, len, decl_state->compressed);
+  lto_free_function_in_decl_state_for_node (this);
+  /* Keep lto file data so ipa-inline-analysis knows about cross module
+     inlining.  */
+
+  timevar_pop (TV_IPA_LTO_GIMPLE_IN);
+
   return true;
 }
 
+/* Prepare function body.  When doing LTO, read cgraph_node's body from disk 
+   if it is not already present.  When some IPA transformations are scheduled,
+   apply them.  */
+
+bool
+cgraph_node::get_body (void)
+{
+  bool updated;
+
+  updated = get_untransformed_body ();
+
+  /* Getting transformed body makes no sense for inline clones;
+     we should never use this on real clones becuase they are materialized
+     early.
+     TODO: Materializing clones here will likely lead to smaller LTRANS
+     footprint. */
+  gcc_assert (!global.inlined_to && !clone_of);
+  if (ipa_transforms_to_apply.exists ())
+    {
+      opt_pass *saved_current_pass = current_pass;
+      FILE *saved_dump_file = dump_file;
+      int saved_dump_flags = dump_flags;
+
+      push_cfun (DECL_STRUCT_FUNCTION (decl));
+      execute_all_ipa_transforms ();
+      cgraph_edge::rebuild_edges ();
+      free_dominance_info (CDI_DOMINATORS);
+      free_dominance_info (CDI_POST_DOMINATORS);
+      pop_cfun ();
+      updated = true;
+
+      current_pass = saved_current_pass;
+      dump_file = saved_dump_file;
+      dump_flags = saved_dump_flags;
+    }
+  return updated;
+}
+
+/* Return the DECL_STRUCT_FUNCTION of the function.  */
+
+struct function *
+cgraph_node::get_fun (void)
+{
+  cgraph_node *node = this;
+  struct function *fun = DECL_STRUCT_FUNCTION (node->decl);
+
+  while (!fun && node->clone_of)
+    {
+      node = node->clone_of;
+      fun = DECL_STRUCT_FUNCTION (node->decl);
+    }
+
+  return fun;
+}
+
 /* Verify if the type of the argument matches that of the function
    declaration.  If we cannot verify this or there is a mismatch,
    return false.  */
 
 static bool
-gimple_check_call_args (gimple stmt, tree fndecl, bool args_count_match)
+gimple_check_call_args (gimple *stmt, tree fndecl, bool args_count_match)
 {
   tree parms, p;
   unsigned int i, nargs;
@@ -3111,7 +3477,7 @@ gimple_check_call_args (gimple stmt, tree fndecl, bool args_count_match)
    If we cannot verify this or there is a mismatch, return false.  */
 
 bool
-gimple_check_call_matching_types (gimple call_stmt, tree callee,
+gimple_check_call_matching_types (gimple *call_stmt, tree callee,
                                  bool args_count_match)
 {
   tree lhs;
@@ -3127,4 +3493,50 @@ gimple_check_call_matching_types (gimple call_stmt, tree callee,
   return true;
 }
 
+/* Reset all state within cgraph.c so that we can rerun the compiler
+   within the same process.  For use by toplev::finalize.  */
+
+void
+cgraph_c_finalize (void)
+{
+  symtab = NULL;
+
+  x_cgraph_nodes_queue = NULL;
+
+  cgraph_fnver_htab = NULL;
+  version_info_node = NULL;
+}
+
+/* A wroker for call_for_symbol_and_aliases.  */
+
+bool
+cgraph_node::call_for_symbol_and_aliases_1 (bool (*callback) (cgraph_node *,
+                                                             void *),
+                                           void *data,
+                                           bool include_overwritable)
+{
+  ipa_ref *ref;
+  FOR_EACH_ALIAS (this, ref)
+    {
+      cgraph_node *alias = dyn_cast <cgraph_node *> (ref->referring);
+      if (include_overwritable
+         || alias->get_availability () > AVAIL_INTERPOSABLE)
+       if (alias->call_for_symbol_and_aliases (callback, data,
+                                               include_overwritable))
+         return true;
+    }
+  return false;
+}
+
+/* Return true if NODE has thunk.  */
+
+bool
+cgraph_node::has_thunk_p (cgraph_node *node, void *)
+{
+  for (cgraph_edge *e = node->callers; e; e = e->next_caller)
+    if (e->caller->thunk.thunk_p)
+      return true;
+  return false;
+}
+
 #include "gt-cgraph.h"