From: Andi Kleen <a...@linux.intel.com>
Again should not really change any behavior (except
for some minor differences with empty types)
gcc/:
2014-07-10 Andi Kleen <a...@linux.intel.com>
* tree.c (build_type_attribute_qual_variant): Use inchash.
(type_hash_list): Dito.
(attribute_hash_list): Dito
(iterative_hstate_expr): Dito.
(iterative_hash_expr): Dito.
(build_range_type_1): Dito.
(build_array_type_1): Dito.
(build_function_type): Dito.
(build_method_type_directly): Dito.
(build_offset_type): Dito.
(build_complex_type): Dito.
(make_vector_type): Dito.
* tree.h (iterative_hash_expr): Add compat wrapper.
(iterative_hstate_expr): Add.
lto/:
2014-07-10 Andi Kleen <a...@linux.intel.com>
* lto.c (hash_canonical_type): Call iterative_hstate_expr.
---
gcc/lto/lto.c | 6 +-
gcc/tree.c | 187 +++++++++++++++++++++++++++++++---------------------------
gcc/tree.h | 14 ++++-
3 files changed, 115 insertions(+), 92 deletions(-)
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index eeb4f8a..c4747a3 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -329,11 +329,9 @@ hash_canonical_type (tree type)
/* OMP lowering can introduce error_mark_node in place of
random local decls in types. */
if (TYPE_MIN_VALUE (TYPE_DOMAIN (type)) != error_mark_node)
- hstate.add_int (iterative_hash_expr (TYPE_MIN_VALUE (
- TYPE_DOMAIN (type)), 0));
+ iterative_hstate_expr (TYPE_MIN_VALUE (TYPE_DOMAIN (type)), hstate);
if (TYPE_MAX_VALUE (TYPE_DOMAIN (type)) != error_mark_node)
- hstate.add_int (iterative_hash_expr (TYPE_MAX_VALUE (
- TYPE_DOMAIN (type)), 0));
+ iterative_hstate_expr (TYPE_MAX_VALUE (TYPE_DOMAIN (type)), hstate);
}
/* Recurse for aggregates with a single element type. */
diff --git a/gcc/tree.c b/gcc/tree.c
index 6de3835..483da18 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -231,8 +231,8 @@ static void print_type_hash_statistics (void);
static void print_debug_expr_statistics (void);
static void print_value_expr_statistics (void);
static int type_hash_marked_p (const void *);
-static unsigned int type_hash_list (const_tree, hashval_t);
-static unsigned int attribute_hash_list (const_tree, hashval_t);
+static void type_hash_list (const_tree, inchash &);
+static void attribute_hash_list (const_tree, inchash &);
tree global_trees[TI_MAX];
tree integer_types[itk_none];
@@ -4587,12 +4587,14 @@ build_type_attribute_qual_variant (tree ttype, tree
attribute, int quals)
{
if (! attribute_list_equal (TYPE_ATTRIBUTES (ttype), attribute))
{
- hashval_t hashcode = 0;
+ inchash hstate;
tree ntype;
int i;
tree t;
enum tree_code code = TREE_CODE (ttype);
+ hstate.begin ();
+
/* Building a distinct copy of a tagged type is inappropriate; it
causes breakage in code that expects there to be a one-to-one
relationship between a struct and its fields.
@@ -4615,39 +4617,37 @@ build_type_attribute_qual_variant (tree ttype, tree
attribute, int quals)
TYPE_ATTRIBUTES (ntype) = attribute;
- hashcode = iterative_hash_object (code, hashcode);
+ hstate.add_int (code);
if (TREE_TYPE (ntype))
- hashcode = iterative_hash_object (TYPE_HASH (TREE_TYPE (ntype)),
- hashcode);
- hashcode = attribute_hash_list (attribute, hashcode);
+ hstate.add_int (TYPE_HASH (TREE_TYPE (ntype)));
+ attribute_hash_list (attribute, hstate);
switch (TREE_CODE (ntype))
{
case FUNCTION_TYPE:
- hashcode = type_hash_list (TYPE_ARG_TYPES (ntype), hashcode);
+ type_hash_list (TYPE_ARG_TYPES (ntype), hstate);
break;
case ARRAY_TYPE:
if (TYPE_DOMAIN (ntype))
- hashcode = iterative_hash_object (TYPE_HASH (TYPE_DOMAIN (ntype)),
- hashcode);
+ hstate.add_int (TYPE_HASH (TYPE_DOMAIN (ntype)));
break;
case INTEGER_TYPE:
t = TYPE_MAX_VALUE (ntype);
for (i = 0; i < TREE_INT_CST_NUNITS (t); i++)
- hashcode = iterative_hash_object (TREE_INT_CST_ELT (t, i),
hashcode);
+ hstate.add_int (TREE_INT_CST_ELT (t, i));
break;
case REAL_TYPE:
case FIXED_POINT_TYPE:
{
unsigned int precision = TYPE_PRECISION (ntype);
- hashcode = iterative_hash_object (precision, hashcode);
+ hstate.add_int (precision);
}
break;
default:
break;
}
- ntype = type_hash_canon (hashcode, ntype);
+ ntype = type_hash_canon (hstate.end(), ntype);
/* If the target-dependent attributes make NTYPE different from
its canonical type, we will need to use structural equality
@@ -6627,17 +6627,14 @@ decl_debug_args_insert (tree from)
with types in the TREE_VALUE slots), by adding the hash codes
of the individual types. */
-static unsigned int
-type_hash_list (const_tree list, hashval_t hashcode)
+static void
+type_hash_list (const_tree list, inchash &hstate)
{
const_tree tail;
for (tail = list; tail; tail = TREE_CHAIN (tail))
if (TREE_VALUE (tail) != error_mark_node)
- hashcode = iterative_hash_object (TYPE_HASH (TREE_VALUE (tail)),
- hashcode);
-
- return hashcode;
+ hstate.add_int (TYPE_HASH (TREE_VALUE (tail)));
}
/* These are the Hashtable callback functions. */
@@ -6865,16 +6862,14 @@ print_type_hash_statistics (void)
with names in the TREE_PURPOSE slots and args in the TREE_VALUE slots),
by adding the hash codes of the individual attributes. */
-static unsigned int
-attribute_hash_list (const_tree list, hashval_t hashcode)
+static void
+attribute_hash_list (const_tree list, inchash &hstate)
{
const_tree tail;
for (tail = list; tail; tail = TREE_CHAIN (tail))
/* ??? Do we want to add in TREE_VALUE too? */
- hashcode = iterative_hash_object
- (IDENTIFIER_HASH_VALUE (get_attribute_name (tail)), hashcode);
- return hashcode;
+ hstate.add_int (IDENTIFIER_HASH_VALUE (get_attribute_name (tail)));
}
/* Given two lists of attributes, return true if list l2 is
@@ -7387,20 +7382,22 @@ commutative_ternary_tree_code (enum tree_code code)
}
/* Generate a hash value for an expression. This can be used iteratively
- by passing a previous result as the VAL argument.
+ by passing a previous result as the HSTATE argument.
This function is intended to produce the same hash for expressions which
would compare equal using operand_equal_p. */
-
-hashval_t
-iterative_hash_expr (const_tree t, hashval_t val)
+void
+iterative_hstate_expr (const_tree t, inchash &hstate)
{
int i;
enum tree_code code;
enum tree_code_class tclass;
if (t == NULL_TREE)
- return iterative_hash_hashval_t (0, val);
+ {
+ hstate.add_int (0);
+ return;
+ }
code = TREE_CODE (t);
@@ -7409,58 +7406,61 @@ iterative_hash_expr (const_tree t, hashval_t val)
/* Alas, constants aren't shared, so we can't rely on pointer
identity. */
case VOID_CST:
- return iterative_hash_hashval_t (0, val);
+ hstate.add_int (0);
+ return;
case INTEGER_CST:
for (i = 0; i < TREE_INT_CST_NUNITS (t); i++)
- val = iterative_hash_host_wide_int (TREE_INT_CST_ELT (t, i), val);
- return val;
+ hstate.add_wide_int (TREE_INT_CST_ELT (t, i));
+ return;
case REAL_CST:
{
unsigned int val2 = real_hash (TREE_REAL_CST_PTR (t));
-
- return iterative_hash_hashval_t (val2, val);
+ hstate.add_int (val2);
+ return;
}
case FIXED_CST:
{
unsigned int val2 = fixed_hash (TREE_FIXED_CST_PTR (t));
-
- return iterative_hash_hashval_t (val2, val);
+ hstate.add_int (val2);
+ return;
}
case STRING_CST:
- return iterative_hash (TREE_STRING_POINTER (t),
- TREE_STRING_LENGTH (t), val);
+ hstate.add ((const void *) TREE_STRING_POINTER (t), TREE_STRING_LENGTH
(t));
+ return;
case COMPLEX_CST:
- val = iterative_hash_expr (TREE_REALPART (t), val);
- return iterative_hash_expr (TREE_IMAGPART (t), val);
+ iterative_hstate_expr (TREE_REALPART (t), hstate);
+ iterative_hstate_expr (TREE_IMAGPART (t), hstate);
+ return;
case VECTOR_CST:
{
unsigned i;
for (i = 0; i < VECTOR_CST_NELTS (t); ++i)
- val = iterative_hash_expr (VECTOR_CST_ELT (t, i), val);
- return val;
+ iterative_hstate_expr (VECTOR_CST_ELT (t, i), hstate);
+ return;
}
case SSA_NAME:
/* We can just compare by pointer. */
- return iterative_hash_host_wide_int (SSA_NAME_VERSION (t), val);
+ hstate.add_wide_int (SSA_NAME_VERSION (t));
+ return;
case PLACEHOLDER_EXPR:
/* The node itself doesn't matter. */
- return val;
+ return;
case TREE_LIST:
/* A list of expressions, for a CALL_EXPR or as the elements of a
VECTOR_CST. */
for (; t; t = TREE_CHAIN (t))
- val = iterative_hash_expr (TREE_VALUE (t), val);
- return val;
+ iterative_hstate_expr (TREE_VALUE (t), hstate);
+ return;
case CONSTRUCTOR:
{
unsigned HOST_WIDE_INT idx;
tree field, value;
FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (t), idx, field, value)
{
- val = iterative_hash_expr (field, val);
- val = iterative_hash_expr (value, val);
+ iterative_hstate_expr (field, hstate);
+ iterative_hstate_expr (value, hstate);
}
- return val;
+ return;
}
case FUNCTION_DECL:
/* When referring to a built-in FUNCTION_DECL, use the __builtin__ form.
@@ -7481,13 +7481,13 @@ iterative_hash_expr (const_tree t, hashval_t val)
if (tclass == tcc_declaration)
{
/* DECL's have a unique ID */
- val = iterative_hash_host_wide_int (DECL_UID (t), val);
+ hstate.add_wide_int (DECL_UID (t));
}
else
{
gcc_assert (IS_EXPR_CODE_CLASS (tclass));
- val = iterative_hash_object (code, val);
+ hstate.add_int (code);
/* Don't hash the type, that can lead to having nodes which
compare equal according to operand_equal_p, but which
@@ -7496,8 +7496,8 @@ iterative_hash_expr (const_tree t, hashval_t val)
|| code == NON_LVALUE_EXPR)
{
/* Make sure to include signness in the hash computation. */
- val += TYPE_UNSIGNED (TREE_TYPE (t));
- val = iterative_hash_expr (TREE_OPERAND (t, 0), val);
+ hstate.add_int (TYPE_UNSIGNED (TREE_TYPE (t)));
+ iterative_hstate_expr (TREE_OPERAND (t, 0), hstate);
}
else if (commutative_tree_code (code))
@@ -7513,14 +7513,14 @@ iterative_hash_expr (const_tree t, hashval_t val)
if (one > two)
t = one, one = two, two = t;
- val = iterative_hash_hashval_t (one, val);
- val = iterative_hash_hashval_t (two, val);
+ hstate.add_int (one);
+ hstate.add_int (two);
}
else
for (i = TREE_OPERAND_LENGTH (t) - 1; i >= 0; --i)
- val = iterative_hash_expr (TREE_OPERAND (t, i), val);
+ iterative_hstate_expr (TREE_OPERAND (t, i), hstate);
}
- return val;
+ return;
}
}
@@ -7713,7 +7713,8 @@ static tree
build_range_type_1 (tree type, tree lowval, tree highval, bool shared)
{
tree itype = make_node (INTEGER_TYPE);
- hashval_t hashcode = 0;
+ inchash hstate;
+ hstate.begin ();
TREE_TYPE (itype) = type;
@@ -7741,10 +7742,10 @@ build_range_type_1 (tree type, tree lowval, tree
highval, bool shared)
return itype;
}
- hashcode = iterative_hash_expr (TYPE_MIN_VALUE (itype), hashcode);
- hashcode = iterative_hash_expr (TYPE_MAX_VALUE (itype), hashcode);
- hashcode = iterative_hash_hashval_t (TYPE_HASH (type), hashcode);
- itype = type_hash_canon (hashcode, itype);
+ iterative_hstate_expr (TYPE_MIN_VALUE (itype), hstate);
+ iterative_hstate_expr (TYPE_MAX_VALUE (itype), hstate);
+ hstate.add_int (TYPE_HASH (type));
+ itype = type_hash_canon (hstate.end (), itype);
return itype;
}
@@ -7849,10 +7850,12 @@ build_array_type_1 (tree elt_type, tree index_type,
bool shared)
if (shared)
{
- hashval_t hashcode = iterative_hash_object (TYPE_HASH (elt_type), 0);
+ inchash hstate;
+ hstate.begin ();
+ hstate.add_int (TYPE_HASH (elt_type));
if (index_type)
- hashcode = iterative_hash_object (TYPE_HASH (index_type), hashcode);
- t = type_hash_canon (hashcode, t);
+ hstate.add_int (TYPE_HASH (index_type));
+ t = type_hash_canon (hstate.end (), t);
}
if (TYPE_CANONICAL (t) == t)
@@ -7992,10 +7995,12 @@ tree
build_function_type (tree value_type, tree arg_types)
{
tree t;
- hashval_t hashcode = 0;
+ inchash hstate;
bool any_structural_p, any_noncanonical_p;
tree canon_argtypes;
+ hstate.begin ();
+
if (TREE_CODE (value_type) == FUNCTION_TYPE)
{
error ("function return type cannot be function");
@@ -8008,9 +8013,9 @@ build_function_type (tree value_type, tree arg_types)
TYPE_ARG_TYPES (t) = arg_types;
/* If we already have such a type, use the old one. */
- hashcode = iterative_hash_object (TYPE_HASH (value_type), hashcode);
- hashcode = type_hash_list (arg_types, hashcode);
- t = type_hash_canon (hashcode, t);
+ hstate.add_int (TYPE_HASH (value_type));
+ type_hash_list (arg_types, hstate);
+ t = type_hash_canon (hstate.end (), t);
/* Set up the canonical type. */
any_structural_p = TYPE_STRUCTURAL_EQUALITY_P (value_type);
@@ -8147,10 +8152,12 @@ build_method_type_directly (tree basetype,
{
tree t;
tree ptype;
- int hashcode = 0;
+ inchash hstate;
bool any_structural_p, any_noncanonical_p;
tree canon_argtypes;
+ hstate.begin ();
+
/* Make a node of the sort we want. */
t = make_node (METHOD_TYPE);
@@ -8164,10 +8171,10 @@ build_method_type_directly (tree basetype,
TYPE_ARG_TYPES (t) = argtypes;
/* If we already have such a type, use the old one. */
- hashcode = iterative_hash_object (TYPE_HASH (basetype), hashcode);
- hashcode = iterative_hash_object (TYPE_HASH (rettype), hashcode);
- hashcode = type_hash_list (argtypes, hashcode);
- t = type_hash_canon (hashcode, t);
+ hstate.add_int (TYPE_HASH (basetype));
+ hstate.add_int (TYPE_HASH (rettype));
+ type_hash_list (argtypes, hstate);
+ t = type_hash_canon (hstate.end (), t);
/* Set up the canonical type. */
any_structural_p
@@ -8215,7 +8222,9 @@ tree
build_offset_type (tree basetype, tree type)
{
tree t;
- hashval_t hashcode = 0;
+ inchash hstate;
+
+ hstate.begin ();
/* Make a node of the sort we want. */
t = make_node (OFFSET_TYPE);
@@ -8224,9 +8233,9 @@ build_offset_type (tree basetype, tree type)
TREE_TYPE (t) = type;
/* If we already have such a type, use the old one. */
- hashcode = iterative_hash_object (TYPE_HASH (basetype), hashcode);
- hashcode = iterative_hash_object (TYPE_HASH (type), hashcode);
- t = type_hash_canon (hashcode, t);
+ hstate.add_int (TYPE_HASH (basetype));
+ hstate.add_int (TYPE_HASH (type));
+ t = type_hash_canon (hstate.end (), t);
if (!COMPLETE_TYPE_P (t))
layout_type (t);
@@ -8252,7 +8261,9 @@ tree
build_complex_type (tree component_type)
{
tree t;
- hashval_t hashcode;
+ inchash hstate;
+
+ hstate.begin ();
gcc_assert (INTEGRAL_TYPE_P (component_type)
|| SCALAR_FLOAT_TYPE_P (component_type)
@@ -8264,8 +8275,8 @@ build_complex_type (tree component_type)
TREE_TYPE (t) = TYPE_MAIN_VARIANT (component_type);
/* If we already have such a type, use the old one. */
- hashcode = iterative_hash_object (TYPE_HASH (component_type), 0);
- t = type_hash_canon (hashcode, t);
+ hstate.add_int (TYPE_HASH (component_type));
+ t = type_hash_canon (hstate.end (), t);
if (!COMPLETE_TYPE_P (t))
layout_type (t);
@@ -9404,7 +9415,9 @@ static tree
make_vector_type (tree innertype, int nunits, enum machine_mode mode)
{
tree t;
- hashval_t hashcode = 0;
+ inchash hstate;
+
+ hstate.begin ();
t = make_node (VECTOR_TYPE);
TREE_TYPE (t) = TYPE_MAIN_VARIANT (innertype);
@@ -9420,11 +9433,11 @@ make_vector_type (tree innertype, int nunits, enum
machine_mode mode)
layout_type (t);
- hashcode = iterative_hash_host_wide_int (VECTOR_TYPE, hashcode);
- hashcode = iterative_hash_host_wide_int (nunits, hashcode);
- hashcode = iterative_hash_host_wide_int (mode, hashcode);
- hashcode = iterative_hash_object (TYPE_HASH (TREE_TYPE (t)), hashcode);
- t = type_hash_canon (hashcode, t);
+ hstate.add_int (VECTOR_TYPE);
+ hstate.add_int (nunits);
+ hstate.add_int (mode);
+ hstate.add_int (TYPE_HASH (TREE_TYPE (t)));
+ t = type_hash_canon (hstate.end (), t);
/* We have built a main variant, based on the main variant of the
inner type. Use it to build the variant we return. */
diff --git a/gcc/tree.h b/gcc/tree.h
index e454e2d..09d39c1 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-core.h"
#include "wide-int.h"
+#include "inchash.h"
/* These includes are required here because they provide declarations
used by inline functions in this file.
@@ -4287,7 +4288,18 @@ extern int tree_log2 (const_tree);
extern int tree_floor_log2 (const_tree);
extern unsigned int tree_ctz (const_tree);
extern int simple_cst_equal (const_tree, const_tree);
-extern hashval_t iterative_hash_expr (const_tree, hashval_t);
+extern void iterative_hstate_expr (const_tree, inchash &);
+
+/* Compat version until all callers are converted. Return hash for
+ TREE with SEED. */
+static inline hashval_t iterative_hash_expr(const_tree tree, hashval_t seed)
+{
+ inchash hstate;
+ hstate.begin (seed);
+ iterative_hstate_expr (tree, hstate);
+ return hstate.end ();
+}
+
extern int compare_tree_int (const_tree, unsigned HOST_WIDE_INT);
extern int type_list_equal (const_tree, const_tree);
extern int chain_member (const_tree, const_tree);
--
2.0.1
