4038c495fc
* c-common.c (complete_array_type): Update to cope with VEC in CONSTRUCTOR_ELTS. * c-pretty-print.c (pp_c_initializer_list): Use pp_c_constructor_elts. (pp_c_constructor_elts): New function. * c-pretty-print.h (pp_c_constructor_elts): Declare. * c-typeck.c (build_function_call, build_c_cast, digest_init, struct constructor_stack, struct initializer_stack, constructor_elements, push_init_level, pop_init_level, add_pending_init, find_init_member, output_init_element): Update to cope with VEC in CONSTRUCTOR_ELTS. * coverage.c (build_fn_info_value, build_ctr_info_value, build_gcov_info): Likewise. * expr.c (categorize_ctor_elements_1, store_constructor, expand_expr_real_1): Likewise. * fold-const.c (fold_ternary): Likewise. * gimplify.c (gimplify_init_ctor_preeval, zero_sized_field_decl, gimplify_init_constructor, gimplify_expr): Likewise. * tree-dump.c (dequeue_and_dump): Likewise. * tree-inline.c (copy_tree_r): Add code to duplicate a CONSTRUCTOR node. * tree-pretty-print.c (dump_generic_node): Update to cope with VEC in CONSTRUCTOR_ELTS. * tree-sra.c (generate_element_init_1): Likewise. * tree-ssa-ccp.c (fold_const_aggregate_ref): Likewise. * tree-ssa-operands.c (get_expr_operands): Likewise. * tree-vect-generic.c (expand_vector_piecewise): Likewise. * tree-vect-transform.c (vect_get_vec_def_for_operand): (get_initial_def_for_reduction): Likewise. * tree-vn.c (set_value_handle, get_value_handle): CONSTURCTOR uses value handle in annotations. * tree.c (tree_node_kind, tree_code_size, make_node_stat, tree_node_structure): Add support for constr_kind. (build_vector_from_ctor, build_constructor_single, build_constructor_from_list): New functions. (build_constructor): Update to take a VEC instead of a TREE_LIST. (simple_cst_equal, iterative_hash_expr, initializer_zerop, walk_tree): Update to cope with VEC in CONSTRUCTOR_ELTS. * tree.def (CONSTRUCTOR): Make it a tcc_exceptional node. * tree.h (FOR_EACH_CONSTRUCTOR_VALUE, FOR_EACH_CONSTRUCTOR_ELT, CONSTRUCTOR_APPEND_ELT): New macros. (struct constructor_elt, struct tree_constructor): New data types. (union tree_node): Add tree_constructor field. * treestruct.def: Define TS_CONSTRUCTOR. * varasm.c (const_hash_1, compare_constant, copy_constant, compute_reloc_for_constant, output_addressed_constants, initializer_constant_valid_p, output_constant, array_size_for_constructor, output_constructor): Update to cope with VEC in CONSTRUCTOR_ELTS. * vec.h (VEC_empty, VEC_copy): New macros. ada/ Make CONSTRUCTOR use VEC to store initializers. * decl.c (gnat_to_gnu_entity): Update to cope with VEC in CONSTRUCTOR_ELTS. * trans.c (extract_values): Likewise. * utils.c (convert, remove_conversions): Likewise. * utils2.c (contains_save_expr_p, build_binary_op, build_unary_op, gnat_build_constructor): Likewise. cp/ Make CONSTRUCTOR use VEC to store initializers. * call.c (convert_default_arg): Update call to digest_init. * class.c (dump_class_hierarchy, dump_array): Update to cope with VEC in CONSTRUCTOR_ELTS. * cp-tree.h (EMPTY_CONSTRUCTOR_P): Likewise. (finish_compound_literal, digest_init): Update declaration. * decl.c (struct reshape_iter): New data type. (reshape_init_array): Rename to... (reshape_init_array_1): Update to cope with VEC in CONSTRUCTOR_ELTS. (reshape_init): Rewrite from scratch. Split parts into... (reshape_init_array, reshape_init_vector, reshape_init_class, reshape_init_r): New functions. (check_initializer): Update call to reshape_init. Remove obsolete code. (initialize_artificial_var, cp_complete_array_type): Update to cope with VEC in CONSTRUCTOR_ELTS. * decl2.c (grokfield): Update calls to digest_init. (mark_vtable_entries): Update to cope with VEC in CONSTRUCTOR_ELTS. * error.c (dump_expr_init_vec): New function. (dump_expr): Use dump_expr_init_vec. * init.c (build_zero_init, build_vec_init): Update to cope with VEC in CONSTRUCTOR_ELTS. (expand_default_init): Update call to digest_init. * parser.c (cp_parser_postfix_expression): Use a VEC for the initializers. (cp_parser_initializer_list): Build a VEC of initializers. * pt.c (tsubst_copy, tsubst_copy_and_build): Update to cope with VEC in CONSTRUCTOR_ELTS. * rtti.c (tinfo_base_init, generic_initializer, ptr_initializer, ptm_initializer, class_initializer, get_pseudo_ti_init): Use build_constructor_from_list instead of build_constructor. * semantics.c (finish_compound_literal): Update call to digest_init. * tree.c (stabilize_init): Update to cope with VEC in CONSTRUCTOR_ELTS. * typeck.c (build_ptrmemfunc1): Likewise. * typeck2.c: (cxx_incomplete_type_error, split_nonconstant_init_1): Likewise. (store_init_value): Use build_constructor_from_list and update call to digest_init. (digest_init): Rewrite. (process_init_constructor): Rewrite from scratch. Split into... (process_init_constructor_array, picflag_from_initializer, process_init_constructor_record, process_init_constructor_union): New functions. (PICFLAG_ERRONEOUS, PICFLAG_NOT_ALL_CONSTANT, PICFLAG_NOT_ALL_SIMPLE): New macros. (build_functional_cast): Use build_constructor_from_list instead of build_constructor. fortran/ Make CONSTRUCTOR use VEC to store initializers. * trans-array.c (gfc_build_null_descriptor, gfc_trans_array_constructor_value, gfc_conv_array_initializer): Update to cope with VEC in CONSTRUCTOR_ELTS. * trans-common.c (create_common): Likewise. * trans-expr.c (gfc_conv_structure): Likewise. * trans-stmt.c (gfc_trans_character_select): Use build_constructor_from_list instead of build_constructor. java/ Make CONSTRUCTOR use VEC to store initializers. * check-init.c (check_init): Update to cope with VEC in CONSTRUCTOR_ELTS. * class.c (make_field_value, make_method_value, get_dispatch_table, make_class_data, emit_symbol_table, emit_catch_table, emit_assertion_table): Use build_constructor_from_list instead of build_constructor. * constants.c (build_constants_constructor): Likewise. * java-gimplify.c (java_gimplify_new_array_init): Update to cope with VEC in CONSTRUCTOR_ELTS. * java-tree.h (START_RECORD_CONSTRUCTOR, PUSH_SUPER_VALUE, PUSH_FIELD_VALUE, FINISH_RECORD_CONSTRUCTOR): Create a VEC instead of a TREE_LIST. * jcf-write.c (generate_bytecode_insns): Update to cope with VEC in CONSTRUCTOR_ELTS. * parse.y (build_new_array_init): Use build_constructor_from_list instead of build_constructor. (patch_new_array_init): Update to cope with VEC in CONSTRUCTOR_ELTS. (array_constructor_check_entry): Likewise. objc/ Make CONSTRUCTOR use VEC to store initializers. * objc-act.c (objc_build_constructor): Use build_constructor_from_list instead of build_constructor. testsuite/ Make CONSTRUCTOR use VEC to store initializers. * g++.dg/ext/complit3.C: Check for specific error messages. * g++.dg/init/brace2.C: Update error message. * g++.dg/warn/Wbraces2.C: Likewise. From-SVN: r102182
320 lines
8.0 KiB
C
320 lines
8.0 KiB
C
/* Value Numbering routines for tree expressions.
|
|
Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
Contributed by Daniel Berlin <dan@dberlin.org>, Steven Bosscher
|
|
<stevenb@suse.de> and Diego Novillo <dnovillo@redhat.com>
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GCC is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GCC; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
|
Boston, MA 02110-1301, USA. */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
#include "tm.h"
|
|
#include "ggc.h"
|
|
#include "tree.h"
|
|
#include "tree-flow.h"
|
|
#include "hashtab.h"
|
|
#include "langhooks.h"
|
|
#include "tree-pass.h"
|
|
#include "tree-dump.h"
|
|
#include "diagnostic.h"
|
|
|
|
/* The value table that maps expressions to values. */
|
|
static htab_t value_table;
|
|
|
|
/* Map expressions to values. These are simple pairs of expressions
|
|
and the values they represent. To find the value represented by
|
|
an expression, we use a hash table where the elements are {e,v}
|
|
pairs, and the expression is the key. */
|
|
typedef struct val_expr_pair_d
|
|
{
|
|
/* Value handle. */
|
|
tree v;
|
|
|
|
/* Associated expression. */
|
|
tree e;
|
|
|
|
/* for comparing Virtual uses in E. */
|
|
tree stmt;
|
|
|
|
/* E's hash value. */
|
|
hashval_t hashcode;
|
|
} *val_expr_pair_t;
|
|
|
|
static void set_value_handle (tree e, tree v);
|
|
|
|
|
|
/* Create and return a new value handle node of type TYPE. */
|
|
|
|
static tree
|
|
make_value_handle (tree type)
|
|
{
|
|
static unsigned int id = 0;
|
|
tree vh;
|
|
|
|
vh = build0 (VALUE_HANDLE, type);
|
|
VALUE_HANDLE_ID (vh) = id++;
|
|
return vh;
|
|
}
|
|
|
|
|
|
/* Given an expression EXPR, compute a hash value number using the
|
|
code of the expression, its real operands and virtual operands (if
|
|
any).
|
|
|
|
VAL can be used to iterate by passing previous value numbers (it is
|
|
used by iterative_hash_expr).
|
|
|
|
STMT is the stmt associated with EXPR for comparing virtual operands. */
|
|
|
|
hashval_t
|
|
vn_compute (tree expr, hashval_t val, tree stmt)
|
|
{
|
|
ssa_op_iter iter;
|
|
tree vuse;
|
|
|
|
/* EXPR must not be a statement. We are only interested in value
|
|
numbering expressions on the RHS of assignments. */
|
|
gcc_assert (expr);
|
|
gcc_assert (!expr->common.ann
|
|
|| expr->common.ann->common.type != STMT_ANN);
|
|
|
|
val = iterative_hash_expr (expr, val);
|
|
|
|
/* If the expression has virtual uses, incorporate them into the
|
|
hash value computed for EXPR. */
|
|
if (stmt)
|
|
FOR_EACH_SSA_TREE_OPERAND (vuse, stmt, iter, SSA_OP_VUSE)
|
|
val = iterative_hash_expr (vuse, val);
|
|
|
|
return val;
|
|
}
|
|
|
|
|
|
/* Compare two expressions E1 and E2 and return true if they are
|
|
equal. */
|
|
|
|
bool
|
|
expressions_equal_p (tree e1, tree e2)
|
|
{
|
|
tree te1, te2;
|
|
|
|
if (e1 == e2)
|
|
return true;
|
|
|
|
te1 = TREE_TYPE (e1);
|
|
te2 = TREE_TYPE (e2);
|
|
|
|
if (TREE_CODE (e1) == TREE_LIST && TREE_CODE (e2) == TREE_LIST)
|
|
{
|
|
tree lop1 = e1;
|
|
tree lop2 = e2;
|
|
for (lop1 = e1, lop2 = e2;
|
|
lop1 || lop2;
|
|
lop1 = TREE_CHAIN (lop1), lop2 = TREE_CHAIN (lop2))
|
|
{
|
|
if (!lop1 || !lop2)
|
|
return false;
|
|
if (!expressions_equal_p (TREE_VALUE (lop1), TREE_VALUE (lop2)))
|
|
return false;
|
|
}
|
|
return true;
|
|
|
|
}
|
|
else if (TREE_CODE (e1) == TREE_CODE (e2)
|
|
&& (te1 == te2 || lang_hooks.types_compatible_p (te1, te2))
|
|
&& operand_equal_p (e1, e2, OEP_PURE_SAME))
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
|
|
/* Hash a {v,e} pair that is pointed to by P.
|
|
The hashcode is cached in the val_expr_pair, so we just return
|
|
that. */
|
|
|
|
static hashval_t
|
|
val_expr_pair_hash (const void *p)
|
|
{
|
|
const val_expr_pair_t ve = (val_expr_pair_t) p;
|
|
return ve->hashcode;
|
|
}
|
|
|
|
|
|
/* Given two val_expr_pair_t's, return true if they represent the same
|
|
expression, false otherwise.
|
|
P1 and P2 should point to the val_expr_pair_t's to be compared. */
|
|
|
|
static int
|
|
val_expr_pair_expr_eq (const void *p1, const void *p2)
|
|
{
|
|
bool ret;
|
|
const val_expr_pair_t ve1 = (val_expr_pair_t) p1;
|
|
const val_expr_pair_t ve2 = (val_expr_pair_t) p2;
|
|
|
|
if (! expressions_equal_p (ve1->e, ve2->e))
|
|
return false;
|
|
|
|
ret = compare_ssa_operands_equal (ve1->stmt, ve2->stmt, SSA_OP_VUSE);
|
|
return ret;
|
|
}
|
|
|
|
|
|
/* Set the value handle for expression E to value V. */
|
|
|
|
static void
|
|
set_value_handle (tree e, tree v)
|
|
{
|
|
if (TREE_CODE (e) == SSA_NAME)
|
|
SSA_NAME_VALUE (e) = v;
|
|
else if (EXPR_P (e) || DECL_P (e) || TREE_CODE (e) == TREE_LIST
|
|
|| TREE_CODE (e) == CONSTRUCTOR)
|
|
get_tree_ann (e)->common.value_handle = v;
|
|
else
|
|
/* Do nothing. Constants are their own value handles. */
|
|
gcc_assert (is_gimple_min_invariant (e));
|
|
}
|
|
|
|
|
|
/* Insert EXPR into VALUE_TABLE with value VAL, and add expression
|
|
EXPR to the value set for value VAL. STMT represents the stmt
|
|
associated with EXPR. It is used when computing a hash value for EXPR. */
|
|
|
|
void
|
|
vn_add (tree expr, tree val, tree stmt)
|
|
{
|
|
void **slot;
|
|
val_expr_pair_t new_pair;
|
|
|
|
new_pair = xmalloc (sizeof (struct val_expr_pair_d));
|
|
new_pair->e = expr;
|
|
new_pair->v = val;
|
|
new_pair->stmt = stmt;
|
|
new_pair->hashcode = vn_compute (expr, 0, stmt);
|
|
slot = htab_find_slot_with_hash (value_table, new_pair, new_pair->hashcode,
|
|
INSERT);
|
|
if (*slot)
|
|
free (*slot);
|
|
*slot = (void *) new_pair;
|
|
|
|
set_value_handle (expr, val);
|
|
add_to_value (val, expr);
|
|
}
|
|
|
|
|
|
/* Search in VALUE_TABLE for an existing instance of expression EXPR,
|
|
and return its value, or NULL if none has been set. STMT
|
|
represents the stmt associated with EXPR. It is used when computing the
|
|
hash value for EXPR. */
|
|
|
|
tree
|
|
vn_lookup (tree expr, tree stmt)
|
|
{
|
|
void **slot;
|
|
struct val_expr_pair_d vep = {NULL, NULL, NULL, 0};
|
|
|
|
/* Constants are their own value. */
|
|
if (is_gimple_min_invariant (expr))
|
|
return expr;
|
|
|
|
vep.e = expr;
|
|
vep.stmt = stmt;
|
|
vep.hashcode = vn_compute (expr, 0, stmt);
|
|
slot = htab_find_slot_with_hash (value_table, &vep, vep.hashcode, NO_INSERT);
|
|
if (!slot)
|
|
return NULL_TREE;
|
|
else
|
|
return ((val_expr_pair_t) *slot)->v;
|
|
}
|
|
|
|
|
|
/* Like vn_lookup, but creates a new value for expression EXPR, if
|
|
EXPR doesn't already have a value. Return the existing/created
|
|
value for EXPR. STMT represents the stmt associated with EXPR. It is used
|
|
when computing the hash value for EXPR. */
|
|
|
|
tree
|
|
vn_lookup_or_add (tree expr, tree stmt)
|
|
{
|
|
tree v = vn_lookup (expr, stmt);
|
|
if (v == NULL_TREE)
|
|
{
|
|
v = make_value_handle (TREE_TYPE (expr));
|
|
|
|
if (dump_file && (dump_flags & TDF_DETAILS))
|
|
{
|
|
fprintf (dump_file, "Created value ");
|
|
print_generic_expr (dump_file, v, dump_flags);
|
|
fprintf (dump_file, " for ");
|
|
print_generic_expr (dump_file, expr, dump_flags);
|
|
fprintf (dump_file, "\n");
|
|
}
|
|
|
|
vn_add (expr, v, stmt);
|
|
}
|
|
|
|
set_value_handle (expr, v);
|
|
|
|
return v;
|
|
}
|
|
|
|
|
|
/* Get the value handle of EXPR. This is the only correct way to get
|
|
the value handle for a "thing". If EXPR does not have a value
|
|
handle associated, it returns NULL_TREE.
|
|
NB: If EXPR is min_invariant, this function is *required* to return EXPR. */
|
|
|
|
tree
|
|
get_value_handle (tree expr)
|
|
{
|
|
|
|
if (is_gimple_min_invariant (expr))
|
|
return expr;
|
|
|
|
if (TREE_CODE (expr) == SSA_NAME)
|
|
return SSA_NAME_VALUE (expr);
|
|
else if (EXPR_P (expr) || DECL_P (expr) || TREE_CODE (expr) == TREE_LIST
|
|
|| TREE_CODE (expr) == CONSTRUCTOR)
|
|
{
|
|
tree_ann_t ann = tree_ann (expr);
|
|
return ((ann) ? ann->common.value_handle : NULL_TREE);
|
|
}
|
|
else
|
|
gcc_unreachable ();
|
|
}
|
|
|
|
|
|
/* Initialize data structures used in value numbering. */
|
|
|
|
void
|
|
vn_init (void)
|
|
{
|
|
value_table = htab_create (511, val_expr_pair_hash,
|
|
val_expr_pair_expr_eq, free);
|
|
}
|
|
|
|
|
|
/* Delete data used for value numbering. */
|
|
|
|
void
|
|
vn_delete (void)
|
|
{
|
|
htab_delete (value_table);
|
|
value_table = NULL;
|
|
}
|