OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree.c (WALK_SUBTREE): Call walk_tree_1. 

2007-08-20  Richard Guenther  <rguenther@suse.de>

	* tree.c (WALK_SUBTREE): Call walk_tree_1.
	(walk_type_fields): Take lh parameter.
	(walk_tree): Rename to ...
	(walk_tree_1): ... this.  Do not call the walk_subtrees
	langhook but the now passed callback.  Pass lh on recursion.
	(walk_tree_without_duplicates): Rename to ...
	(walk_tree_without_duplicates_1): ... this.  Take lh parameter
	and call walk_tree_1.
	* tree.h (walk_tree_lh): New typedef.
	(walk_tree_1): Declare.
	(walk_tree_without_duplicates_1): Likewise.
	(walk_tree): New define to walk_tree_1 with NULL lh parameter.
	(walk_tree_without_duplicates): New define to
	walk_tree_without_duplicates_1 with NULL lh parameter.
	* langhooks.c (lhd_tree_inlining_walk_subtrees): Remove.
	* langhooks.h (lang_hooks_for_tree_inlining): Remove walk_subtrees
	langhook.
	* langhooks-def.h (lhd_tree_inlining_walk_subtrees): Remove.
	(LANG_HOOKS_TREE_INLINING_WALK_SUBTREES): Likewise.
	(LANG_HOOKS_TREE_INLINING_INITIALIZER): Remove walk_subtrees
	initializer.

	java/
	* lang.c (java_tree_inlining_walk_subtrees): Remove.
	(LANG_HOOKS_TREE_INLINING_WALK_SUBTREES): Remove.

	cp/
	* cp-objcp-common.h (LANG_HOOKS_TREE_INLINING_WALK_SUBTREES):
	Remove define.
	* tree.h (cp_walk_tree): New define to walk_tree_1 with
	cp_walk_subtrees lh parameter.
	(cp_walk_tree_without_duplicates): New define to
	walk_tree_without_duplicates_1 with cp_walk_subtrees lh parameter.
	* tree.c (count_trees): Call
	cp_walk_tree_without_duplicates.
	(verify_stmt_tree): Call cp_walk_tree.
	(break_out_target_exprs): Likewise.
	(WALK_SUBTREE): Likewise.
	* cp-gimplify.c (cp_genericize): Likewise.
	* cp-pt.c (find_parameter_packs_r): Likewise.
	(uses_parameter_packs): Likewise.
	(make_pack_expansion): Likewise.
	(check_for_bare_parameter_packs): Likewise.
	(for_each_template_parm): Likewise.
	* decl.c (check_default_argument): Call
	cp_walk_tree_without_duplicates.
	* except.c (build_throw): Likewise.
	* decl2.c (type_visibility): Likewise.
	* semantics.c (expand_or_defer_fn): Likewise.
	(finalize_nrv): Call cp_walk_tree.

From-SVN: r127642
This commit is contained in:
Richard Guenther 2007-08-20 11:19:22 +00:00 committed by Richard Biener
parent 412bbe81d9
commit 145881069e
18 changed files with 118 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gcc/ChangeLog
View File

@ -1,3 +1,27 @@
2007-08-20 Richard Guenther <rguenther@suse.de>
* tree.c (WALK_SUBTREE): Call walk_tree_1.
(walk_type_fields): Take lh parameter.
(walk_tree): Rename to ...
(walk_tree_1): ... this. Do not call the walk_subtrees
langhook but the now passed callback. Pass lh on recursion.
(walk_tree_without_duplicates): Rename to ...
(walk_tree_without_duplicates_1): ... this. Take lh parameter
and call walk_tree_1.
* tree.h (walk_tree_lh): New typedef.
(walk_tree_1): Declare.
(walk_tree_without_duplicates_1): Likewise.
(walk_tree): New define to walk_tree_1 with NULL lh parameter.
(walk_tree_without_duplicates): New define to
walk_tree_without_duplicates_1 with NULL lh parameter.
* langhooks.c (lhd_tree_inlining_walk_subtrees): Remove.
* langhooks.h (lang_hooks_for_tree_inlining): Remove walk_subtrees
langhook.
* langhooks-def.h (lhd_tree_inlining_walk_subtrees): Remove.
(LANG_HOOKS_TREE_INLINING_WALK_SUBTREES): Likewise.
(LANG_HOOKS_TREE_INLINING_INITIALIZER): Remove walk_subtrees
initializer.
2007-08-20 Andrew Pinski <andrew_pinski@playstation.sony.com> 2007-08-20 Andrew Pinski <andrew_pinski@playstation.sony.com>
PR middle-end/30564 PR middle-end/30564

26
gcc/cp/ChangeLog
View File

@ -1,3 +1,29 @@
2007-08-20 Richard Guenther <rguenther@suse.de>
* cp-objcp-common.h (LANG_HOOKS_TREE_INLINING_WALK_SUBTREES):
Remove define.
* tree.h (cp_walk_tree): New define to walk_tree_1 with
cp_walk_subtrees lh parameter.
(cp_walk_tree_without_duplicates): New define to
walk_tree_without_duplicates_1 with cp_walk_subtrees lh parameter.
* tree.c (count_trees): Call
cp_walk_tree_without_duplicates.
(verify_stmt_tree): Call cp_walk_tree.
(break_out_target_exprs): Likewise.
(WALK_SUBTREE): Likewise.
* cp-gimplify.c (cp_genericize): Likewise.
* cp-pt.c (find_parameter_packs_r): Likewise.
(uses_parameter_packs): Likewise.
(make_pack_expansion): Likewise.
(check_for_bare_parameter_packs): Likewise.
(for_each_template_parm): Likewise.
* decl.c (check_default_argument): Call
cp_walk_tree_without_duplicates.
* except.c (build_throw): Likewise.
* decl2.c (type_visibility): Likewise.
* semantics.c (expand_or_defer_fn): Likewise.
(finalize_nrv): Call cp_walk_tree.
2007-08-20 Jakub Jelinek <jakub@redhat.com> 2007-08-20 Jakub Jelinek <jakub@redhat.com>
PR c++/33025 PR c++/33025

2
gcc/cp/cp-gimplify.c
View File

@ -746,7 +746,7 @@ cp_genericize (tree fndecl)
/* We do want to see every occurrence of the parms, so we can't just use /* We do want to see every occurrence of the parms, so we can't just use
walk_tree's hash functionality. */ walk_tree's hash functionality. */
p_set = pointer_set_create (); p_set = pointer_set_create ();
walk_tree (&DECL_SAVED_TREE (fndecl), cp_genericize_r, p_set, NULL); cp_walk_tree (&DECL_SAVED_TREE (fndecl), cp_genericize_r, p_set, NULL);
pointer_set_destroy (p_set); pointer_set_destroy (p_set);
/* Do everything else. */ /* Do everything else. */

3
gcc/cp/cp-objcp-common.h
View File

@ -104,9 +104,6 @@ extern tree objcp_tsubst_copy_and_build (tree, tree, tsubst_flags_t,
#undef LANG_HOOKS_ATTRIBUTE_TABLE #undef LANG_HOOKS_ATTRIBUTE_TABLE
#define LANG_HOOKS_ATTRIBUTE_TABLE cxx_attribute_table #define LANG_HOOKS_ATTRIBUTE_TABLE cxx_attribute_table
#undef LANG_HOOKS_TREE_INLINING_WALK_SUBTREES
#define LANG_HOOKS_TREE_INLINING_WALK_SUBTREES \
cp_walk_subtrees
#undef LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN #undef LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN
#define LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN \ #define LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN \
cp_cannot_inline_tree_fn cp_cannot_inline_tree_fn

4
gcc/cp/cp-tree.h
View File

@ -4736,6 +4736,10 @@ extern void verify_stmt_tree (tree);
extern linkage_kind decl_linkage (tree); extern linkage_kind decl_linkage (tree);
extern tree cp_walk_subtrees (tree*, int*, walk_tree_fn, extern tree cp_walk_subtrees (tree*, int*, walk_tree_fn,
void*, struct pointer_set_t*); void*, struct pointer_set_t*);
#define cp_walk_tree(a,b,c,d) \
walk_tree_1 (a, b, c, d, cp_walk_subtrees)
#define cp_walk_tree_without_duplicates(a,b,c) \
walk_tree_without_duplicates_1 (a, b, c, cp_walk_subtrees)
extern int cp_cannot_inline_tree_fn (tree*); extern int cp_cannot_inline_tree_fn (tree*);
extern int cp_auto_var_in_fn_p (const_tree, const_tree); extern int cp_auto_var_in_fn_p (const_tree, const_tree);
extern tree fold_if_not_in_template (tree); extern tree fold_if_not_in_template (tree);

3
gcc/cp/decl.c
View File

@ -9061,8 +9061,7 @@ check_default_argument (tree decl, tree arg)
The keyword `this' shall not be used in a default argument of a The keyword `this' shall not be used in a default argument of a
member function. */ member function. */
var = walk_tree_without_duplicates (&arg, local_variable_p_walkfn, var = cp_walk_tree_without_duplicates (&arg, local_variable_p_walkfn, NULL);
NULL);
if (var) if (var)
{ {
error ("default argument %qE uses local variable %qD", arg, var); error ("default argument %qE uses local variable %qD", arg, var);

2
gcc/cp/decl2.c
View File

@ -1561,7 +1561,7 @@ static int
type_visibility (tree type) type_visibility (tree type)
{ {
int vis = VISIBILITY_DEFAULT; int vis = VISIBILITY_DEFAULT;
walk_tree_without_duplicates (&type, min_vis_r, &vis); cp_walk_tree_without_duplicates (&type, min_vis_r, &vis);
return vis; return vis;
} }

2
gcc/cp/except.c
View File

@ -782,7 +782,7 @@ build_throw (tree exp)
we don't have to do them during unwinding. But first wrap we don't have to do them during unwinding. But first wrap
them in MUST_NOT_THROW_EXPR, since they are run after the them in MUST_NOT_THROW_EXPR, since they are run after the
exception object is initialized. */ exception object is initialized. */
walk_tree_without_duplicates (&temp_expr, wrap_cleanups_r, 0); cp_walk_tree_without_duplicates (&temp_expr, wrap_cleanups_r, 0);
exp = build2 (COMPOUND_EXPR, TREE_TYPE (exp), temp_expr, exp); exp = build2 (COMPOUND_EXPR, TREE_TYPE (exp), temp_expr, exp);
exp = build1 (CLEANUP_POINT_EXPR, TREE_TYPE (exp), exp); exp = build1 (CLEANUP_POINT_EXPR, TREE_TYPE (exp), exp);
} }

34
gcc/cp/pt.c
View File

@ -2391,7 +2391,7 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data)
if (TYPE_P (t)) if (TYPE_P (t))
{ {
tree context = TYPE_CONTEXT (t); tree context = TYPE_CONTEXT (t);
walk_tree (&context, &find_parameter_packs_r, ppd, ppd->visited); cp_walk_tree (&context, &find_parameter_packs_r, ppd, ppd->visited);
} }
/* This switch statement will return immediately if we don't find a /* This switch statement will return immediately if we don't find a
@ -2405,8 +2405,8 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data)
case BOUND_TEMPLATE_TEMPLATE_PARM: case BOUND_TEMPLATE_TEMPLATE_PARM:
/* Check the template arguments. */ /* Check the template arguments. */
walk_tree (&TYPE_TI_ARGS (t), &find_parameter_packs_r, ppd, cp_walk_tree (&TYPE_TI_ARGS (t), &find_parameter_packs_r, ppd,
ppd->visited); ppd->visited);
/* Dig out the underlying TEMPLATE_TEMPLATE_PARM. */ /* Dig out the underlying TEMPLATE_TEMPLATE_PARM. */
t = TYPE_TI_TEMPLATE (t); t = TYPE_TI_TEMPLATE (t);
@ -2442,7 +2442,7 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data)
if (TYPE_TEMPLATE_INFO (t)) if (TYPE_TEMPLATE_INFO (t))
{ {
tree args = TREE_VALUE (TYPE_TEMPLATE_INFO (t)); tree args = TREE_VALUE (TYPE_TEMPLATE_INFO (t));
walk_tree (&args, &find_parameter_packs_r, ppd, ppd->visited); cp_walk_tree (&args, &find_parameter_packs_r, ppd, ppd->visited);
} }
*walk_subtrees = 0; *walk_subtrees = 0;
@ -2462,8 +2462,8 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data)
return NULL_TREE; return NULL_TREE;
case INTEGER_TYPE: case INTEGER_TYPE:
walk_tree (&TYPE_MAX_VALUE (t), &find_parameter_packs_r, cp_walk_tree (&TYPE_MAX_VALUE (t), &find_parameter_packs_r,
ppd, ppd->visited); ppd, ppd->visited);
*walk_subtrees = 0; *walk_subtrees = 0;
return NULL_TREE; return NULL_TREE;
@ -2485,7 +2485,7 @@ uses_parameter_packs (tree t)
struct find_parameter_pack_data ppd; struct find_parameter_pack_data ppd;
ppd.parameter_packs = &parameter_packs; ppd.parameter_packs = &parameter_packs;
ppd.visited = pointer_set_create (); ppd.visited = pointer_set_create ();
walk_tree (&t, &find_parameter_packs_r, &ppd, ppd.visited); cp_walk_tree (&t, &find_parameter_packs_r, &ppd, ppd.visited);
pointer_set_destroy (ppd.visited); pointer_set_destroy (ppd.visited);
return parameter_packs != NULL_TREE; return parameter_packs != NULL_TREE;
} }
@ -2535,8 +2535,8 @@ make_pack_expansion (tree arg)
class expansion. */ class expansion. */
ppd.visited = pointer_set_create (); ppd.visited = pointer_set_create ();
ppd.parameter_packs = &parameter_packs; ppd.parameter_packs = &parameter_packs;
walk_tree (&TREE_PURPOSE (arg), &find_parameter_packs_r, cp_walk_tree (&TREE_PURPOSE (arg), &find_parameter_packs_r,
&ppd, ppd.visited); &ppd, ppd.visited);
if (parameter_packs == NULL_TREE) if (parameter_packs == NULL_TREE)
{ {
@ -2553,8 +2553,8 @@ make_pack_expansion (tree arg)
{ {
/* Determine which parameter packs will be expanded in this /* Determine which parameter packs will be expanded in this
argument. */ argument. */
walk_tree (&TREE_VALUE (value), &find_parameter_packs_r, cp_walk_tree (&TREE_VALUE (value), &find_parameter_packs_r,
&ppd, ppd.visited); &ppd, ppd.visited);
} }
} }
@ -2592,7 +2592,7 @@ make_pack_expansion (tree arg)
/* Determine which parameter packs will be expanded. */ /* Determine which parameter packs will be expanded. */
ppd.parameter_packs = &parameter_packs; ppd.parameter_packs = &parameter_packs;
ppd.visited = pointer_set_create (); ppd.visited = pointer_set_create ();
walk_tree (&arg, &find_parameter_packs_r, &ppd, ppd.visited); cp_walk_tree (&arg, &find_parameter_packs_r, &ppd, ppd.visited);
pointer_set_destroy (ppd.visited); pointer_set_destroy (ppd.visited);
/* Make sure we found some parameter packs. */ /* Make sure we found some parameter packs. */
@ -2637,7 +2637,7 @@ check_for_bare_parameter_packs (tree t)
ppd.parameter_packs = &parameter_packs; ppd.parameter_packs = &parameter_packs;
ppd.visited = pointer_set_create (); ppd.visited = pointer_set_create ();
walk_tree (&t, &find_parameter_packs_r, &ppd, ppd.visited); cp_walk_tree (&t, &find_parameter_packs_r, &ppd, ppd.visited);
pointer_set_destroy (ppd.visited); pointer_set_destroy (ppd.visited);
if (parameter_packs) if (parameter_packs)
@ -5896,10 +5896,10 @@ for_each_template_parm (tree t, tree_fn_t fn, void* data,
pfd.visited = visited; pfd.visited = visited;
else else
pfd.visited = pointer_set_create (); pfd.visited = pointer_set_create ();
result = walk_tree (&t, result = cp_walk_tree (&t,
for_each_template_parm_r, for_each_template_parm_r,
&pfd, &pfd,
pfd.visited) != NULL_TREE; pfd.visited) != NULL_TREE;
/* Clean up. */ /* Clean up. */
if (!visited) if (!visited)

8
gcc/cp/semantics.c
View File

@ -3184,9 +3184,9 @@ expand_or_defer_fn (tree fn)
} }
/* Replace AGGR_INIT_EXPRs with appropriate CALL_EXPRs. */ /* Replace AGGR_INIT_EXPRs with appropriate CALL_EXPRs. */
walk_tree_without_duplicates (&DECL_SAVED_TREE (fn), cp_walk_tree_without_duplicates (&DECL_SAVED_TREE (fn),
simplify_aggr_init_exprs_r, simplify_aggr_init_exprs_r,
NULL); NULL);
/* If this is a constructor or destructor body, we have to clone /* If this is a constructor or destructor body, we have to clone
it. */ it. */
@ -3336,7 +3336,7 @@ finalize_nrv (tree *tp, tree var, tree result)
data.var = var; data.var = var;
data.result = result; data.result = result;
data.visited = htab_create (37, htab_hash_pointer, htab_eq_pointer, NULL); data.visited = htab_create (37, htab_hash_pointer, htab_eq_pointer, NULL);
walk_tree (tp, finalize_nrv_r, &data, 0); cp_walk_tree (tp, finalize_nrv_r, &data, 0);
htab_delete (data.visited); htab_delete (data.visited);
} }

10
gcc/cp/tree.c
View File

@ -1282,7 +1282,7 @@ int
count_trees (tree t) count_trees (tree t)
{ {
int n_trees = 0; int n_trees = 0;
walk_tree_without_duplicates (&t, count_trees_r, &n_trees); cp_walk_tree_without_duplicates (&t, count_trees_r, &n_trees);
return n_trees; return n_trees;
} }
@ -1319,7 +1319,7 @@ verify_stmt_tree (tree t)
{ {
htab_t statements; htab_t statements;
statements = htab_create (37, htab_hash_pointer, htab_eq_pointer, NULL); statements = htab_create (37, htab_hash_pointer, htab_eq_pointer, NULL);
walk_tree (&t, verify_stmt_tree_r, &statements, NULL); cp_walk_tree (&t, verify_stmt_tree_r, &statements, NULL);
htab_delete (statements); htab_delete (statements);
} }
@ -1521,8 +1521,8 @@ break_out_target_exprs (tree t)
target_remap = splay_tree_new (splay_tree_compare_pointers, target_remap = splay_tree_new (splay_tree_compare_pointers,
/*splay_tree_delete_key_fn=*/NULL, /*splay_tree_delete_key_fn=*/NULL,
/*splay_tree_delete_value_fn=*/NULL); /*splay_tree_delete_value_fn=*/NULL);
walk_tree (&t, bot_manip, target_remap, NULL); cp_walk_tree (&t, bot_manip, target_remap, NULL);
walk_tree (&t, bot_replace, target_remap, NULL); cp_walk_tree (&t, bot_replace, target_remap, NULL);
if (!--target_remap_count) if (!--target_remap_count)
{ {
@ -2290,7 +2290,7 @@ cp_walk_subtrees (tree *tp, int *walk_subtrees_p, walk_tree_fn func,
#define WALK_SUBTREE(NODE) \ #define WALK_SUBTREE(NODE) \
do \ do \
{ \ { \
result = walk_tree (&(NODE), func, data, pset); \ result = cp_walk_tree (&(NODE), func, data, pset); \
if (result) goto out; \ if (result) goto out; \
} \ } \
while (0) while (0)

5
gcc/java/ChangeLog
View File

@ -1,3 +1,8 @@
2007-08-20 Richard Guenther <rguenther@suse.de>
* lang.c (java_tree_inlining_walk_subtrees): Remove.
(LANG_HOOKS_TREE_INLINING_WALK_SUBTREES): Remove.
2007-08-17 Tom Tromey <tromey@redhat.com> 2007-08-17 Tom Tromey <tromey@redhat.com>
* typeck.c (find_method_in_interfaces): Update. * typeck.c (find_method_in_interfaces): Update.

44
gcc/java/lang.c
View File

@ -55,8 +55,6 @@ static int java_handle_option (size_t scode, const char *arg, int value);
static void put_decl_string (const char *, int); static void put_decl_string (const char *, int);
static void put_decl_node (tree); static void put_decl_node (tree);
static void java_print_error_function (diagnostic_context *, const char *); static void java_print_error_function (diagnostic_context *, const char *);
static tree java_tree_inlining_walk_subtrees (tree *, int *, walk_tree_fn,
void *, struct pointer_set_t *);
static int merge_init_test_initialization (void * *, void *); static int merge_init_test_initialization (void * *, void *);
static int inline_init_test_initialization (void * *, void *); static int inline_init_test_initialization (void * *, void *);
static bool java_dump_tree (void *, tree); static bool java_dump_tree (void *, tree);
@ -188,9 +186,6 @@ struct language_function GTY(())
#undef LANG_HOOKS_GIMPLIFY_EXPR #undef LANG_HOOKS_GIMPLIFY_EXPR
#define LANG_HOOKS_GIMPLIFY_EXPR java_gimplify_expr #define LANG_HOOKS_GIMPLIFY_EXPR java_gimplify_expr
#undef LANG_HOOKS_TREE_INLINING_WALK_SUBTREES
#define LANG_HOOKS_TREE_INLINING_WALK_SUBTREES java_tree_inlining_walk_subtrees
#undef LANG_HOOKS_DECL_OK_FOR_SIBCALL #undef LANG_HOOKS_DECL_OK_FOR_SIBCALL
#define LANG_HOOKS_DECL_OK_FOR_SIBCALL java_decl_ok_for_sibcall #define LANG_HOOKS_DECL_OK_FOR_SIBCALL java_decl_ok_for_sibcall
@ -688,45 +683,6 @@ decl_constant_value (tree decl)
return decl; return decl;
} }
/* Walk the language specific tree nodes during inlining. */
static tree
java_tree_inlining_walk_subtrees (tree *tp ATTRIBUTE_UNUSED,
int *subtrees ATTRIBUTE_UNUSED,
walk_tree_fn func ATTRIBUTE_UNUSED,
void *data ATTRIBUTE_UNUSED,
struct pointer_set_t *pset ATTRIBUTE_UNUSED)
{
enum tree_code code;
tree result;
#define WALK_SUBTREE(NODE) \
do \
{ \
result = walk_tree (&(NODE), func, data, pset); \
if (result) \
return result; \
} \
while (0)
tree t = *tp;
if (!t)
return NULL_TREE;
code = TREE_CODE (t);
switch (code)
{
case BLOCK:
WALK_SUBTREE (BLOCK_EXPR_BODY (t));
return NULL_TREE;
default:
return NULL_TREE;
}
#undef WALK_SUBTREE
}
/* Every call to a static constructor has an associated boolean /* Every call to a static constructor has an associated boolean
variable which is in the outermost scope of the calling method. variable which is in the outermost scope of the calling method.
This variable is used to avoid multiple calls to the static This variable is used to avoid multiple calls to the static

4
gcc/langhooks-def.h
View File

@ -68,8 +68,6 @@ extern tree lhd_expr_to_decl (tree, bool *, bool *, bool *);
extern tree lhd_builtin_function (tree decl); extern tree lhd_builtin_function (tree decl);
/* Declarations of default tree inlining hooks. */ /* Declarations of default tree inlining hooks. */
extern tree lhd_tree_inlining_walk_subtrees (tree *, int *, walk_tree_fn,
void *, struct pointer_set_t*);
extern int lhd_tree_inlining_cannot_inline_tree_fn (tree *); extern int lhd_tree_inlining_cannot_inline_tree_fn (tree *);
extern int lhd_tree_inlining_disregard_inline_limits (const_tree); extern int lhd_tree_inlining_disregard_inline_limits (const_tree);
extern int lhd_tree_inlining_auto_var_in_fn_p (const_tree, const_tree); extern int lhd_tree_inlining_auto_var_in_fn_p (const_tree, const_tree);
@ -135,7 +133,6 @@ extern void lhd_omp_firstprivatize_type_sizes (struct gimplify_omp_ctx *,
#define LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE NULL #define LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE NULL
/* Tree inlining hooks. */ /* Tree inlining hooks. */
#define LANG_HOOKS_TREE_INLINING_WALK_SUBTREES lhd_tree_inlining_walk_subtrees
#define LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN \ #define LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN \
lhd_tree_inlining_cannot_inline_tree_fn lhd_tree_inlining_cannot_inline_tree_fn
#define LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS \ #define LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS \
@ -146,7 +143,6 @@ extern void lhd_omp_firstprivatize_type_sizes (struct gimplify_omp_ctx *,
hook_bool_tree_tree_false hook_bool_tree_tree_false
#define LANG_HOOKS_TREE_INLINING_INITIALIZER { \ #define LANG_HOOKS_TREE_INLINING_INITIALIZER { \
LANG_HOOKS_TREE_INLINING_WALK_SUBTREES, \
LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN, \ LANG_HOOKS_TREE_INLINING_CANNOT_INLINE_TREE_FN, \
LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS, \ LANG_HOOKS_TREE_INLINING_DISREGARD_INLINE_LIMITS, \
LANG_HOOKS_TREE_INLINING_AUTO_VAR_IN_FN_P, \ LANG_HOOKS_TREE_INLINING_AUTO_VAR_IN_FN_P, \

21
gcc/langhooks.c
View File

@ -276,27 +276,6 @@ lhd_types_compatible_p (tree x, tree y)
return TYPE_MAIN_VARIANT (x) == TYPE_MAIN_VARIANT (y); return TYPE_MAIN_VARIANT (x) == TYPE_MAIN_VARIANT (y);
} }
/* lang_hooks.tree_inlining.walk_subtrees is called by walk_tree()
after handling common cases, but before walking code-specific
sub-trees. If this hook is overridden for a language, it should
handle language-specific tree codes, as well as language-specific
information associated to common tree codes. If a tree node is
completely handled within this function, it should set *SUBTREES to
0, so that generic handling isn't attempted. The generic handling
cannot deal with language-specific tree codes, so make sure it is
set properly. Both SUBTREES and *SUBTREES is guaranteed to be
nonzero when the function is called. */
tree
lhd_tree_inlining_walk_subtrees (tree *tp ATTRIBUTE_UNUSED,
int *subtrees ATTRIBUTE_UNUSED,
walk_tree_fn func ATTRIBUTE_UNUSED,
void *data ATTRIBUTE_UNUSED,
struct pointer_set_t *pset ATTRIBUTE_UNUSED)
{
return NULL_TREE;
}
/* lang_hooks.tree_inlining.cannot_inline_tree_fn is called to /* lang_hooks.tree_inlining.cannot_inline_tree_fn is called to
determine whether there are language-specific reasons for not determine whether there are language-specific reasons for not
inlining a given function. */ inlining a given function. */

3
gcc/langhooks.h
View File

@ -35,9 +35,6 @@ typedef void (*lang_print_tree_hook) (FILE *, tree, int indent);
struct lang_hooks_for_tree_inlining struct lang_hooks_for_tree_inlining
{ {
tree (*walk_subtrees) (tree *, int *,
tree (*) (tree *, int *, void *),
void *, struct pointer_set_t*);
int (*cannot_inline_tree_fn) (tree *); int (*cannot_inline_tree_fn) (tree *);
int (*disregard_inline_limits) (const_tree); int (*disregard_inline_limits) (const_tree);
int (*auto_var_in_fn_p) (const_tree, const_tree); int (*auto_var_in_fn_p) (const_tree, const_tree);

26
gcc/tree.c
View File

@ -8233,7 +8233,7 @@ num_ending_zeros (const_tree x)
#define WALK_SUBTREE(NODE) \ #define WALK_SUBTREE(NODE) \
do \ do \
{ \ { \
result = walk_tree (&(NODE), func, data, pset); \ result = walk_tree_1 (&(NODE), func, data, pset, lh); \
if (result) \ if (result) \
return result; \ return result; \
} \ } \
@ -8245,7 +8245,7 @@ num_ending_zeros (const_tree x)
static tree static tree
walk_type_fields (tree type, walk_tree_fn func, void *data, walk_type_fields (tree type, walk_tree_fn func, void *data,
struct pointer_set_t *pset) struct pointer_set_t *pset, walk_tree_lh lh)
{ {
tree result = NULL_TREE; tree result = NULL_TREE;
@ -8325,7 +8325,8 @@ walk_type_fields (tree type, walk_tree_fn func, void *data,
and to avoid visiting a node more than once. */ and to avoid visiting a node more than once. */
tree tree
walk_tree (tree *tp, walk_tree_fn func, void *data, struct pointer_set_t *pset) walk_tree_1 (tree *tp, walk_tree_fn func, void *data,
struct pointer_set_t *pset, walk_tree_lh lh)
{ {
enum tree_code code; enum tree_code code;
int walk_subtrees; int walk_subtrees;
@ -8372,10 +8373,12 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, struct pointer_set_t *pset)
return NULL_TREE; return NULL_TREE;
} }
result = lang_hooks.tree_inlining.walk_subtrees (tp, &walk_subtrees, func, if (lh)
data, pset); {
if (result || !walk_subtrees) result = (*lh) (tp, &walk_subtrees, func, data, pset);
return result; if (result || !walk_subtrees)
return result;
}
switch (code) switch (code)
{ {
@ -8529,7 +8532,7 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, struct pointer_set_t *pset)
if (result || !walk_subtrees) if (result || !walk_subtrees)
return result; return result;
result = walk_type_fields (*type_p, func, data, pset); result = walk_type_fields (*type_p, func, data, pset, lh);
if (result) if (result)
return result; return result;
@ -8594,7 +8597,7 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, struct pointer_set_t *pset)
} }
/* If this is a type, walk the needed fields in the type. */ /* If this is a type, walk the needed fields in the type. */
else if (TYPE_P (*tp)) else if (TYPE_P (*tp))
return walk_type_fields (*tp, func, data, pset); return walk_type_fields (*tp, func, data, pset, lh);
break; break;
} }
@ -8608,13 +8611,14 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, struct pointer_set_t *pset)
/* Like walk_tree, but does not walk duplicate nodes more than once. */ /* Like walk_tree, but does not walk duplicate nodes more than once. */
tree tree
walk_tree_without_duplicates (tree *tp, walk_tree_fn func, void *data) walk_tree_without_duplicates_1 (tree *tp, walk_tree_fn func, void *data,
walk_tree_lh lh)
{ {
tree result; tree result;
struct pointer_set_t *pset; struct pointer_set_t *pset;
pset = pointer_set_create (); pset = pointer_set_create ();
result = walk_tree (tp, func, data, pset); result = walk_tree_1 (tp, func, data, pset, lh);
pointer_set_destroy (pset); pointer_set_destroy (pset);
return result; return result;
} }

16
gcc/tree.h
View File

@ -5026,8 +5026,20 @@ struct pointer_set_t;
/* The type of a callback function for walking over tree structure. */ /* The type of a callback function for walking over tree structure. */
typedef tree (*walk_tree_fn) (tree *, int *, void *); typedef tree (*walk_tree_fn) (tree *, int *, void *);
extern tree walk_tree (tree*, walk_tree_fn, void*, struct pointer_set_t*);
extern tree walk_tree_without_duplicates (tree*, walk_tree_fn, void*); /* The type of a callback function that represents a custom walk_tree. */
typedef tree (*walk_tree_lh) (tree *, int *, tree (*) (tree *, int *, void *),
void *, struct pointer_set_t*);
extern tree walk_tree_1 (tree*, walk_tree_fn, void*, struct pointer_set_t*,
walk_tree_lh);
extern tree walk_tree_without_duplicates_1 (tree*, walk_tree_fn, void*,
walk_tree_lh);
#define walk_tree(a,b,c,d) \
walk_tree_1 (a, b, c, d, NULL)
#define walk_tree_without_duplicates(a,b,c) \
walk_tree_without_duplicates_1 (a, b, c, NULL)
/* Assign the RTX to declaration. */ /* Assign the RTX to declaration. */