re PR target/65697 (__atomic memory barriers not strong enough for __sync builtins)

[gcc.git] / gcc / gimple-ssa.h

diff --git a/gcc/gimple-ssa.h b/gcc/gimple-ssa.h
index 8bcbf6782a6cf9a4f42315615acf76bd97f6221f..25dde08315839b5179b69b9d8e21c26402f5b61f 100644 (file)
--- a/gcc/gimple-ssa.h
+++ b/gcc/gimple-ssa.h
@@ -1,6 +1,6 @@
 /* Header file for routines that straddle the border between GIMPLE and
    SSA in gimple.
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -21,16 +21,49 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_GIMPLE_SSA_H
 #define GCC_GIMPLE_SSA_H
 
+#include "tree-hasher.h"
 #include "tree-ssa-operands.h"
 
 /* This structure is used to map a gimple statement to a label,
    or list of labels to represent transaction restart.  */
 
-struct GTY(()) tm_restart_node {
+struct GTY((for_user)) tm_restart_node {
   gimple stmt;
   tree label_or_list;
 };
 
+/* Hasher for tm_restart_node.  */
+
+struct tm_restart_hasher : ggc_ptr_hash<tm_restart_node>
+{
+  static hashval_t hash (tm_restart_node *n) { return htab_hash_pointer (n); }
+
+  static bool
+  equal (tm_restart_node *a, tm_restart_node *b)
+  {
+    return a == b;
+  }
+};
+
+struct ssa_name_hasher : ggc_ptr_hash<tree_node>
+{
+  /* Hash a tree in a uid_decl_map.  */
+
+  static hashval_t
+  hash (tree item)
+  {
+    return item->ssa_name.var->decl_minimal.uid;
+  }
+
+  /* Return true if the DECL_UID in both trees are equal.  */
+
+  static bool
+  equal (tree a, tree b)
+{
+  return (a->ssa_name.var->decl_minimal.uid == b->ssa_name.var->decl_minimal.uid);
+}
+};
+
 /* Gimple dataflow datastructure. All publicly available fields shall have
    gimple_ accessor defined, all publicly modifiable fields should have
    gimple_set accessor.  */
@@ -53,7 +86,7 @@ struct GTY(()) gimple_df {
 
   /* A map of decls to artificial ssa-names that point to the partition
      of the decl.  */
-  struct pointer_map_t * GTY((skip(""))) decls_to_pointers;
+  hash_map<tree, tree> * GTY((skip(""))) decls_to_pointers;
 
   /* Free list of SSA_NAMEs.  */
   vec<tree, va_gc> *free_ssanames;
@@ -62,7 +95,7 @@ struct GTY(()) gimple_df {
      means that the first reference to this variable in the function is a
      USE or a VUSE.  In those cases, the SSA renamer creates an SSA name
      for this variable with an empty defining statement.  */
-  htab_t GTY((param_is (union tree_node))) default_defs;
+  hash_table<ssa_name_hasher> *default_defs;
 
   /* True if there are any symbols that need to be renamed.  */
   unsigned int ssa_renaming_needed : 1;
@@ -80,7 +113,7 @@ struct GTY(()) gimple_df {
 
   /* Map gimple stmt to tree label (or list of labels) for transaction
      restart and abort.  */
-  htab_t GTY ((param_is (struct tm_restart_node))) tm_restart;
+  hash_table<tm_restart_hasher> *tm_restart;
 };
 
 
@@ -109,7 +142,7 @@ gimple_vuse_op (const_gimple g)
 {
   struct use_optype_d *ops;
   const gimple_statement_with_memory_ops *mem_ops_stmt =
-     dyn_cast <const gimple_statement_with_memory_ops> (g);
+     dyn_cast <const gimple_statement_with_memory_ops *> (g);
   if (!mem_ops_stmt)
     return NULL_USE_OPERAND_P;
   ops = mem_ops_stmt->use_ops;
@@ -125,7 +158,7 @@ static inline def_operand_p
 gimple_vdef_op (gimple g)
 {
   gimple_statement_with_memory_ops *mem_ops_stmt =
-     dyn_cast <gimple_statement_with_memory_ops> (g);
+     dyn_cast <gimple_statement_with_memory_ops *> (g);
   if (!mem_ops_stmt)
     return NULL_DEF_OPERAND_P;
   if (mem_ops_stmt->vdef)