This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Use direct calls to lang_hooks
- From: Steven Bosscher <stevenb at suse dot de>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Roger Sayle <roger at eyesopen dot com>
- Date: Sat, 15 May 2004 21:24:38 +0200
- Subject: Use direct calls to lang_hooks
- Organization: SUSE Labs
Hi,
A lot of the files merged from the tree-ssa branch still used the
(*lang_hooks.foo) () style to call lang hooks. This patch replaces
them with lang_hooks.foo () style calls, just like Roger Sayle did
a few weeks ago. I've also made expand_expr a static inline function
instead of a preprocessor macro, so that the remaining two
(*lang_hooks.expand_expr) calls can now also be written in the new
style.
Extemely mechanical, of course. I plan to commit this as obvious
later today.
Gr.
Steven
* c-gimplify.c (c_genericize):
Replace calls via (*lang_hooks.foo) with lang_hooks.foo.
* c-parse.in <expr_no_commas>: Likewise.
<if_prefix>: Likewise.
<select_or_iter_stmt>: Likewise.
* expr.c (expand_var, expand_expr_real_1): Likewise.
* expr.h (expand_expr): Make it a static inline function.
Move prototype for expand_expr_real up before this.
* fold-const.c (fold_relational_hi_lo, fold_relational_const):
Likewise.
* gimplify.c (gimple_boolify, gimplify_addr_expr,
gimplify_asm_expr, gimplify_expr): Likewise.
* tree-cfg.c (dump_tree_cfg, dump_cfg_stats, tree_cfg2vcg,
dump_function_to_file): Likewise.
* tree-dfa.c (dump_immediate_uses, dump_dfa_stats): Likewise.
* tree-inline.c (remap_block, save_body, walk_tree): Likewise.
* tree-into-ssa.c (dump_tree_ssa): Likewise.
* tree-mudflap.c (mf_varname_tree, mf_file_function_line_tree):
Likewise.
* tree-optimize.c (execute_one_pass): Likewise.
* tree-pretty-print.c (dump_generic_bb_buff): Likewise.
* tree-ssa-alias.c (dump_alias_stats, dump_alias_info): Likewise.
objc/
* objc-act.c (objc_build_try_enter_fragment,
objc_build_try_epilogue, objc_build_catch_stmt,
objc_build_finally_prologue): Replace calls via (*lang_hooks.foo)
with lang_hooks.foo ().
Index: c-gimplify.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-gimplify.c,v
retrieving revision 2.1
diff -c -3 -p -r2.1 c-gimplify.c
*** c-gimplify.c 14 May 2004 02:29:19 -0000 2.1
--- c-gimplify.c 15 May 2004 18:51:23 -0000
*************** c_genericize (tree fndecl)
*** 142,148 ****
if (dump_file)
{
fprintf (dump_file, "\n;; Function %s",
! (*lang_hooks.decl_printable_name) (fndecl, 2));
fprintf (dump_file, " (%s)\n",
IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (fndecl)));
fprintf (dump_file, ";; enabled by -%s\n", dump_flag_name (TDI_original));
--- 142,148 ----
if (dump_file)
{
fprintf (dump_file, "\n;; Function %s",
! lang_hooks.decl_printable_name (fndecl, 2));
fprintf (dump_file, " (%s)\n",
IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (fndecl)));
fprintf (dump_file, ";; enabled by -%s\n", dump_flag_name (TDI_original));
Index: c-parse.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-parse.in,v
retrieving revision 1.204
diff -c -3 -p -r1.204 c-parse.in
*** c-parse.in 13 May 2004 06:39:29 -0000 1.204
--- c-parse.in 15 May 2004 18:51:24 -0000
*************** expr_no_commas:
*** 566,586 ****
| expr_no_commas '^' expr_no_commas
{ $$ = parser_build_binary_op ($2, $1, $3); }
| expr_no_commas ANDAND
! { $1 = (*lang_hooks.truthvalue_conversion)
(default_conversion ($1));
skip_evaluation += $1 == truthvalue_false_node; }
expr_no_commas
{ skip_evaluation -= $1 == truthvalue_false_node;
$$ = parser_build_binary_op (TRUTH_ANDIF_EXPR, $1, $4); }
| expr_no_commas OROR
! { $1 = (*lang_hooks.truthvalue_conversion)
(default_conversion ($1));
skip_evaluation += $1 == truthvalue_true_node; }
expr_no_commas
{ skip_evaluation -= $1 == truthvalue_true_node;
$$ = parser_build_binary_op (TRUTH_ORIF_EXPR, $1, $4); }
| expr_no_commas '?'
! { $1 = (*lang_hooks.truthvalue_conversion)
(default_conversion ($1));
skip_evaluation += $1 == truthvalue_false_node; }
expr ':'
--- 566,586 ----
| expr_no_commas '^' expr_no_commas
{ $$ = parser_build_binary_op ($2, $1, $3); }
| expr_no_commas ANDAND
! { $1 = lang_hooks.truthvalue_conversion
(default_conversion ($1));
skip_evaluation += $1 == truthvalue_false_node; }
expr_no_commas
{ skip_evaluation -= $1 == truthvalue_false_node;
$$ = parser_build_binary_op (TRUTH_ANDIF_EXPR, $1, $4); }
| expr_no_commas OROR
! { $1 = lang_hooks.truthvalue_conversion
(default_conversion ($1));
skip_evaluation += $1 == truthvalue_true_node; }
expr_no_commas
{ skip_evaluation -= $1 == truthvalue_true_node;
$$ = parser_build_binary_op (TRUTH_ORIF_EXPR, $1, $4); }
| expr_no_commas '?'
! { $1 = lang_hooks.truthvalue_conversion
(default_conversion ($1));
skip_evaluation += $1 == truthvalue_false_node; }
expr ':'
*************** expr_no_commas:
*** 594,600 ****
pedwarn ("ISO C forbids omitting the middle term of a ?: expression");
/* Make sure first operand is calculated only once. */
$<ttype>2 = save_expr (default_conversion ($1));
! $1 = (*lang_hooks.truthvalue_conversion) ($<ttype>2);
skip_evaluation += $1 == truthvalue_true_node; }
':' expr_no_commas
{ skip_evaluation -= $1 == truthvalue_true_node;
--- 594,600 ----
pedwarn ("ISO C forbids omitting the middle term of a ?: expression");
/* Make sure first operand is calculated only once. */
$<ttype>2 = save_expr (default_conversion ($1));
! $1 = lang_hooks.truthvalue_conversion ($<ttype>2);
skip_evaluation += $1 == truthvalue_true_node; }
':' expr_no_commas
{ skip_evaluation -= $1 == truthvalue_true_node;
*************** if_prefix:
*** 2141,2147 ****
IF
{ $<ttype>$ = c_begin_if_stmt (); }
'(' expr ')'
! { c_expand_start_cond ((*lang_hooks.truthvalue_conversion) ($4),
compstmt_count,$<ttype>2);
$<itype>$ = stmt_count;
if_stmt_locus = $<location>-1; }
--- 2141,2147 ----
IF
{ $<ttype>$ = c_begin_if_stmt (); }
'(' expr ')'
! { c_expand_start_cond (lang_hooks.truthvalue_conversion ($4),
compstmt_count,$<ttype>2);
$<itype>$ = stmt_count;
if_stmt_locus = $<location>-1; }
*************** select_or_iter_stmt:
*** 2247,2262 ****
$<ttype>$ = c_begin_while_stmt (); }
'(' expr ')'
{ c_in_iteration_stmt++;
! $4 = (*lang_hooks.truthvalue_conversion) ($4);
c_finish_while_stmt_cond
! ((*lang_hooks.truthvalue_conversion) ($4), $<ttype>2);
$<ttype>$ = add_stmt ($<ttype>2); }
c99_block_lineno_labeled_stmt
{ c_in_iteration_stmt--;
RECHAIN_STMTS ($<ttype>6, WHILE_BODY ($<ttype>6)); }
| do_stmt_start
'(' expr ')' ';'
! { DO_COND ($1) = (*lang_hooks.truthvalue_conversion) ($3); }
| do_stmt_start error
{ }
| FOR
--- 2247,2262 ----
$<ttype>$ = c_begin_while_stmt (); }
'(' expr ')'
{ c_in_iteration_stmt++;
! $4 = lang_hooks.truthvalue_conversion ($4);
c_finish_while_stmt_cond
! (lang_hooks.truthvalue_conversion ($4), $<ttype>2);
$<ttype>$ = add_stmt ($<ttype>2); }
c99_block_lineno_labeled_stmt
{ c_in_iteration_stmt--;
RECHAIN_STMTS ($<ttype>6, WHILE_BODY ($<ttype>6)); }
| do_stmt_start
'(' expr ')' ';'
! { DO_COND ($1) = lang_hooks.truthvalue_conversion ($3); }
| do_stmt_start error
{ }
| FOR
*************** select_or_iter_stmt:
*** 2269,2275 ****
xexpr ';'
{ if ($6)
FOR_COND ($<ttype>2)
! = (*lang_hooks.truthvalue_conversion) ($6); }
xexpr ')'
{ c_in_iteration_stmt++;
FOR_EXPR ($<ttype>2) = $9; }
--- 2269,2275 ----
xexpr ';'
{ if ($6)
FOR_COND ($<ttype>2)
! = lang_hooks.truthvalue_conversion ($6); }
xexpr ')'
{ c_in_iteration_stmt++;
FOR_EXPR ($<ttype>2) = $9; }
Index: expr.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/expr.c,v
retrieving revision 1.645
diff -c -3 -p -r1.645 expr.c
*** expr.c 13 May 2004 06:39:38 -0000 1.645
--- expr.c 15 May 2004 18:51:25 -0000
*************** expand_var (tree var)
*** 6211,6217 ****
set_mem_attributes (x, var, 1);
SET_DECL_RTL (var, x);
}
! else if ((*lang_hooks.expand_decl) (var))
/* OK. */;
else if (TREE_CODE (var) == VAR_DECL && !TREE_STATIC (var))
expand_decl (var);
--- 6211,6217 ----
set_mem_attributes (x, var, 1);
SET_DECL_RTL (var, x);
}
! else if (lang_hooks.expand_decl (var))
/* OK. */;
else if (TREE_CODE (var) == VAR_DECL && !TREE_STATIC (var))
expand_decl (var);
*************** expand_expr_real_1 (tree exp, rtx target
*** 6860,6866 ****
{
if (TREE_USED (block))
abort ();
! (*lang_hooks.decls.insert_block) (block);
}
}
--- 6860,6866 ----
{
if (TREE_USED (block))
abort ();
! lang_hooks.decls.insert_block (block);
}
}
*************** expand_expr_real_1 (tree exp, rtx target
*** 7617,7626 ****
{
if (DECL_BUILT_IN_CLASS (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
== BUILT_IN_FRONTEND)
! /* ??? Use (*fun) form because expand_expr is a macro. */
! return (*lang_hooks.expand_expr) (exp, original_target,
! tmode, modifier,
! alt_rtl);
else
return expand_builtin (exp, target, subtarget, tmode, ignore);
}
--- 7617,7625 ----
{
if (DECL_BUILT_IN_CLASS (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
== BUILT_IN_FRONTEND)
! return lang_hooks.expand_expr (exp, original_target,
! tmode, modifier,
! alt_rtl);
else
return expand_builtin (exp, target, subtarget, tmode, ignore);
}
*************** expand_expr_real_1 (tree exp, rtx target
*** 9365,9373 ****
return const0_rtx;
default:
! /* ??? Use (*fun) form because expand_expr is a macro. */
! return (*lang_hooks.expand_expr) (exp, original_target, tmode,
! modifier, alt_rtl);
}
/* Here to do an ordinary binary operator, generating an instruction
--- 9364,9371 ----
return const0_rtx;
default:
! return lang_hooks.expand_expr (exp, original_target, tmode,
! modifier, alt_rtl);
}
/* Here to do an ordinary binary operator, generating an instruction
Index: expr.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/expr.h,v
retrieving revision 1.156
diff -c -3 -p -r1.156 expr.h
*** expr.h 13 May 2004 06:39:38 -0000 1.156
--- expr.h 15 May 2004 18:51:25 -0000
*************** extern rtx store_expr (tree, rtx, int);
*** 508,520 ****
Useful after calling expand_expr with 1 as sum_ok. */
extern rtx force_operand (rtx, rtx);
/* Generate code for computing expression EXP.
An rtx for the computed value is returned. The value is never null.
In the case of a void EXP, const0_rtx is returned. */
! #define expand_expr(EXP, TARGET, MODE, MODIFIER) \
! expand_expr_real((EXP), (TARGET), (MODE), (MODIFIER), NULL)
! extern rtx expand_expr_real (tree, rtx, enum machine_mode,
! enum expand_modifier, rtx *);
extern void expand_var (tree);
--- 508,526 ----
Useful after calling expand_expr with 1 as sum_ok. */
extern rtx force_operand (rtx, rtx);
+ /* Work horse for expand_expr. */
+ extern rtx expand_expr_real (tree, rtx, enum machine_mode,
+ enum expand_modifier, rtx *);
+
/* Generate code for computing expression EXP.
An rtx for the computed value is returned. The value is never null.
In the case of a void EXP, const0_rtx is returned. */
! static inline rtx
! expand_expr (tree exp, rtx target, enum machine_mode mode,
! enum expand_modifier modifier)
! {
! return expand_expr_real(exp, target, mode, modifier, NULL);
! }
extern void expand_var (tree);
Index: fold-const.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fold-const.c,v
retrieving revision 1.375
diff -c -3 -p -r1.375 fold-const.c
*** fold-const.c 13 May 2004 06:39:39 -0000 1.375
--- fold-const.c 15 May 2004 18:51:25 -0000
*************** fold_relational_hi_lo (enum tree_code *c
*** 9372,9379 ****
if (code == LE_EXPR || code == GT_EXPR)
{
tree st0, st1, exp, retval;
! st0 = (*lang_hooks.types.signed_type) (TREE_TYPE (op0));
! st1 = (*lang_hooks.types.signed_type) (TREE_TYPE (op1));
exp = build (code == LE_EXPR ? GE_EXPR: LT_EXPR,
type,
--- 9372,9379 ----
if (code == LE_EXPR || code == GT_EXPR)
{
tree st0, st1, exp, retval;
! st0 = lang_hooks.types.signed_type (TREE_TYPE (op0));
! st1 = lang_hooks.types.signed_type (TREE_TYPE (op1));
exp = build (code == LE_EXPR ? GE_EXPR: LT_EXPR,
type,
*************** fold_relational_const (enum tree_code co
*** 10013,10019 ****
TREE_TYPE (tem) = type;
if (TREE_CODE (type) == BOOLEAN_TYPE)
! return (*lang_hooks.truthvalue_conversion) (tem);
return tem;
}
--- 10013,10019 ----
TREE_TYPE (tem) = type;
if (TREE_CODE (type) == BOOLEAN_TYPE)
! return lang_hooks.truthvalue_conversion (tem);
return tem;
}
Index: gimplify.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gimplify.c,v
retrieving revision 2.2
diff -c -3 -p -r2.2 gimplify.c
*** gimplify.c 14 May 2004 02:29:20 -0000 2.2
--- gimplify.c 15 May 2004 18:51:26 -0000
*************** gimple_boolify (tree expr)
*** 2229,2235 ****
/* If this is the predicate of a COND_EXPR, it might not even be a
truthvalue yet. */
! expr = (*lang_hooks.truthvalue_conversion) (expr);
switch (TREE_CODE (expr))
{
--- 2229,2235 ----
/* If this is the predicate of a COND_EXPR, it might not even be a
truthvalue yet. */
! expr = lang_hooks.truthvalue_conversion (expr);
switch (TREE_CODE (expr))
{
*************** gimplify_addr_expr (tree *expr_p, tree *
*** 2693,2699 ****
recompute_tree_invarant_for_addr_expr (expr);
/* Mark the RHS addressable. */
! (*lang_hooks.mark_addressable) (TREE_OPERAND (expr, 0));
}
break;
}
--- 2693,2699 ----
recompute_tree_invarant_for_addr_expr (expr);
/* Mark the RHS addressable. */
! lang_hooks.mark_addressable (TREE_OPERAND (expr, 0));
}
break;
}
*************** gimplify_asm_expr (tree *expr_p, tree *p
*** 2736,2742 ****
&allows_mem, &allows_reg, &is_inout);
if (!allows_reg && allows_mem)
! (*lang_hooks.mark_addressable) (TREE_VALUE (link));
tret = gimplify_expr (&TREE_VALUE (link), pre_p, post_p,
is_inout ? is_gimple_min_lval : is_gimple_lvalue,
--- 2736,2742 ----
&allows_mem, &allows_reg, &is_inout);
if (!allows_reg && allows_mem)
! lang_hooks.mark_addressable (TREE_VALUE (link));
tret = gimplify_expr (&TREE_VALUE (link), pre_p, post_p,
is_inout ? is_gimple_min_lval : is_gimple_lvalue,
*************** gimplify_asm_expr (tree *expr_p, tree *p
*** 2786,2792 ****
/* If the operand is a memory input, it should be an lvalue. */
if (!allows_reg && allows_mem)
{
! (*lang_hooks.mark_addressable) (TREE_VALUE (link));
tret = gimplify_expr (&TREE_VALUE (link), pre_p, post_p,
is_gimple_lvalue, fb_lvalue | fb_mayfail);
if (tret == GS_ERROR)
--- 2786,2792 ----
/* If the operand is a memory input, it should be an lvalue. */
if (!allows_reg && allows_mem)
{
! lang_hooks.mark_addressable (TREE_VALUE (link));
tret = gimplify_expr (&TREE_VALUE (link), pre_p, post_p,
is_gimple_lvalue, fb_lvalue | fb_mayfail);
if (tret == GS_ERROR)
*************** gimplify_expr (tree *expr_p, tree *pre_p
*** 3100,3106 ****
}
/* Do any language-specific gimplification. */
! ret = (*lang_hooks.gimplify_expr) (expr_p, pre_p, post_p);
if (ret == GS_OK)
{
if (*expr_p == NULL_TREE)
--- 3100,3106 ----
}
/* Do any language-specific gimplification. */
! ret = lang_hooks.gimplify_expr (expr_p, pre_p, post_p);
if (ret == GS_OK)
{
if (*expr_p == NULL_TREE)
Index: tree-cfg.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-cfg.c,v
retrieving revision 2.1
diff -c -3 -p -r2.1 tree-cfg.c
*** tree-cfg.c 13 May 2004 06:39:47 -0000 2.1
--- tree-cfg.c 15 May 2004 18:51:26 -0000
*************** dump_tree_cfg (FILE *file, int flags)
*** 2141,2147 ****
if (flags & TDF_DETAILS)
{
const char *funcname
! = (*lang_hooks.decl_printable_name) (current_function_decl, 2);
fputc ('\n', file);
fprintf (file, ";; Function %s\n\n", funcname);
--- 2141,2147 ----
if (flags & TDF_DETAILS)
{
const char *funcname
! = lang_hooks.decl_printable_name (current_function_decl, 2);
fputc ('\n', file);
fprintf (file, ";; Function %s\n\n", funcname);
*************** dump_cfg_stats (FILE *file)
*** 2172,2178 ****
const char * const fmt_str_1 = "%-30s%13lu%11lu%c\n";
const char * const fmt_str_3 = "%-43s%11lu%c\n";
const char *funcname
! = (*lang_hooks.decl_printable_name) (current_function_decl, 2);
fprintf (file, "\nCFG Statistics for %s\n\n", funcname);
--- 2172,2178 ----
const char * const fmt_str_1 = "%-30s%13lu%11lu%c\n";
const char * const fmt_str_3 = "%-43s%11lu%c\n";
const char *funcname
! = lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "\nCFG Statistics for %s\n\n", funcname);
*************** tree_cfg2vcg (FILE *file)
*** 2237,2243 ****
edge e;
basic_block bb;
const char *funcname
! = (*lang_hooks.decl_printable_name) (current_function_decl, 2);
/* Write the file header. */
fprintf (file, "graph: { title: \"%s\"\n", funcname);
--- 2237,2243 ----
edge e;
basic_block bb;
const char *funcname
! = lang_hooks.decl_printable_name (current_function_decl, 2);
/* Write the file header. */
fprintf (file, "graph: { title: \"%s\"\n", funcname);
*************** dump_function_to_file (tree fn, FILE *fi
*** 4062,4068 ****
basic_block bb;
tree chain;
! fprintf (file, "%s (", (*lang_hooks.decl_printable_name) (fn, 2));
arg = DECL_ARGUMENTS (fn);
while (arg)
--- 4062,4068 ----
basic_block bb;
tree chain;
! fprintf (file, "%s (", lang_hooks.decl_printable_name (fn, 2));
arg = DECL_ARGUMENTS (fn);
while (arg)
Index: tree-dfa.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-dfa.c,v
retrieving revision 2.3
diff -c -3 -p -r2.3 tree-dfa.c
*** tree-dfa.c 14 May 2004 15:27:36 -0000 2.3
--- tree-dfa.c 15 May 2004 18:51:26 -0000
*************** dump_immediate_uses (FILE *file)
*** 605,611 ****
basic_block bb;
block_stmt_iterator si;
const char *funcname
! = (*lang_hooks.decl_printable_name) (current_function_decl, 2);
fprintf (file, "\nDef-use edges for function %s\n", funcname);
--- 605,611 ----
basic_block bb;
block_stmt_iterator si;
const char *funcname
! = lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "\nDef-use edges for function %s\n", funcname);
*************** dump_dfa_stats (FILE *file)
*** 682,688 ****
const char * const fmt_str_1 = "%-30s%13lu%11lu%c\n";
const char * const fmt_str_3 = "%-43s%11lu%c\n";
const char *funcname
! = (*lang_hooks.decl_printable_name) (current_function_decl, 2);
collect_dfa_stats (&dfa_stats);
--- 682,688 ----
const char * const fmt_str_1 = "%-30s%13lu%11lu%c\n";
const char * const fmt_str_3 = "%-43s%11lu%c\n";
const char *funcname
! = lang_hooks.decl_printable_name (current_function_decl, 2);
collect_dfa_stats (&dfa_stats);
Index: tree-inline.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-inline.c,v
retrieving revision 1.101
diff -c -3 -p -r1.101 tree-inline.c
*** tree-inline.c 14 May 2004 02:29:22 -0000 1.101
--- tree-inline.c 15 May 2004 18:51:26 -0000
*************** remap_block (tree *block, inline_data *i
*** 394,400 ****
/* We're building a clone; DECL_INITIAL is still
error_mark_node, and current_binding_level is the parm
binding level. */
! (*lang_hooks.decls.insert_block) (new_block);
else
{
/* Attach this new block after the DECL_INITIAL block for the
--- 394,400 ----
/* We're building a clone; DECL_INITIAL is still
error_mark_node, and current_binding_level is the parm
binding level. */
! lang_hooks.decls.insert_block (new_block);
else
{
/* Attach this new block after the DECL_INITIAL block for the
*************** save_body (tree fn, tree *arg_copy)
*** 1930,1936 ****
for (parg = arg_copy; *parg; parg = &TREE_CHAIN (*parg))
{
tree new = copy_node (*parg);
! (*lang_hooks.dup_lang_specific_decl) (new);
DECL_ABSTRACT_ORIGIN (new) = DECL_ORIGIN (*parg);
insert_decl_map (&id, *parg, new);
TREE_CHAIN (new) = TREE_CHAIN (*parg);
--- 1930,1936 ----
for (parg = arg_copy; *parg; parg = &TREE_CHAIN (*parg))
{
tree new = copy_node (*parg);
! lang_hooks.dup_lang_specific_decl (new);
DECL_ABSTRACT_ORIGIN (new) = DECL_ORIGIN (*parg);
insert_decl_map (&id, *parg, new);
TREE_CHAIN (new) = TREE_CHAIN (*parg);
*************** walk_tree (tree *tp, walk_tree_fn func,
*** 2017,2024 ****
return NULL_TREE;
}
! result = (*lang_hooks.tree_inlining.walk_subtrees) (tp, &walk_subtrees, func,
! data, htab);
if (result || ! walk_subtrees)
return result;
--- 2017,2024 ----
return NULL_TREE;
}
! result = lang_hooks.tree_inlining.walk_subtrees (tp, &walk_subtrees, func,
! data, htab);
if (result || ! walk_subtrees)
return result;
*************** walk_tree (tree *tp, walk_tree_fn func,
*** 2056,2062 ****
}
#endif
! if ((*lang_hooks.tree_inlining.tree_chain_matters_p) (*tp))
/* Check our siblings. */
WALK_SUBTREE_TAIL (TREE_CHAIN (*tp));
}
--- 2056,2062 ----
}
#endif
! if (lang_hooks.tree_inlining.tree_chain_matters_p (*tp))
/* Check our siblings. */
WALK_SUBTREE_TAIL (TREE_CHAIN (*tp));
}
Index: tree-into-ssa.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-into-ssa.c,v
retrieving revision 2.5
diff -c -3 -p -r2.5 tree-into-ssa.c
*** tree-into-ssa.c 14 May 2004 02:29:22 -0000 2.5
--- tree-into-ssa.c 15 May 2004 18:51:26 -0000
*************** dump_tree_ssa (FILE *file)
*** 570,576 ****
{
basic_block bb;
const char *funcname
! = (*lang_hooks.decl_printable_name) (current_function_decl, 2);
fprintf (file, "SSA information for %s\n\n", funcname);
--- 570,576 ----
{
basic_block bb;
const char *funcname
! = lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "SSA information for %s\n\n", funcname);
Index: tree-mudflap.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-mudflap.c,v
retrieving revision 2.2
diff -c -3 -p -r2.2 tree-mudflap.c
*** tree-mudflap.c 14 May 2004 02:29:22 -0000 2.2
--- tree-mudflap.c 15 May 2004 18:51:26 -0000
*************** mf_varname_tree (tree decl)
*** 344,350 ****
{
const char *funcname = NULL;
if (DECL_NAME (current_function_decl))
! funcname = (*lang_hooks.decl_printable_name) (current_function_decl, 1);
if (funcname == NULL)
funcname = "anonymous fn";
--- 344,350 ----
{
const char *funcname = NULL;
if (DECL_NAME (current_function_decl))
! funcname = lang_hooks.decl_printable_name (current_function_decl, 1);
if (funcname == NULL)
funcname = "anonymous fn";
*************** mf_varname_tree (tree decl)
*** 369,375 ****
}
if (declname == NULL)
! declname = (*lang_hooks.decl_printable_name) (decl, 3);
if (declname == NULL)
declname = "<unnamed variable>";
--- 369,375 ----
}
if (declname == NULL)
! declname = lang_hooks.decl_printable_name (decl, 3);
if (declname == NULL)
declname = "<unnamed variable>";
*************** mf_file_function_line_tree (location_t *
*** 415,421 ****
colon = line = "";
/* Add (FUNCTION). */
! name = (*lang_hooks.decl_printable_name) (current_function_decl, 1);
if (name)
{
op = " (";
--- 415,421 ----
colon = line = "";
/* Add (FUNCTION). */
! name = lang_hooks.decl_printable_name (current_function_decl, 1);
if (name)
{
op = " (";
Index: tree-optimize.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-optimize.c,v
retrieving revision 2.15
diff -c -3 -p -r2.15 tree-optimize.c
*** tree-optimize.c 13 May 2004 06:39:48 -0000 2.15
--- tree-optimize.c 15 May 2004 18:51:26 -0000
*************** execute_one_pass (struct tree_opt_pass *
*** 386,392 ****
if (dump_file)
{
const char *dname, *aname;
! dname = (*lang_hooks.decl_printable_name) (current_function_decl, 2);
aname = (IDENTIFIER_POINTER
(DECL_ASSEMBLER_NAME (current_function_decl)));
fprintf (dump_file, "\n;; Function %s (%s)\n\n", dname, aname);
--- 386,392 ----
if (dump_file)
{
const char *dname, *aname;
! dname = lang_hooks.decl_printable_name (current_function_decl, 2);
aname = (IDENTIFIER_POINTER
(DECL_ASSEMBLER_NAME (current_function_decl)));
fprintf (dump_file, "\n;; Function %s (%s)\n\n", dname, aname);
Index: tree-pretty-print.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-pretty-print.c,v
retrieving revision 2.1
diff -c -3 -p -r2.1 tree-pretty-print.c
*** tree-pretty-print.c 13 May 2004 06:39:48 -0000 2.1
--- tree-pretty-print.c 15 May 2004 18:51:26 -0000
*************** static void dump_generic_bb_buff (pretty
*** 52,59 ****
#define PRINT_FUNCTION_NAME(NODE) pp_printf \
(buffer, "%s", TREE_CODE (NODE) == NOP_EXPR ? \
! (*lang_hooks.decl_printable_name) (TREE_OPERAND (NODE, 0), 1) : \
! (*lang_hooks.decl_printable_name) (NODE, 1))
#define MASK_POINTER(P) ((unsigned)((unsigned long)(P) & 0xffff))
--- 52,59 ----
#define PRINT_FUNCTION_NAME(NODE) pp_printf \
(buffer, "%s", TREE_CODE (NODE) == NOP_EXPR ? \
! lang_hooks.decl_printable_name (TREE_OPERAND (NODE, 0), 1) : \
! lang_hooks.decl_printable_name (NODE, 1))
#define MASK_POINTER(P) ((unsigned)((unsigned long)(P) & 0xffff))
Index: tree-ssa-alias.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-ssa-alias.c,v
retrieving revision 2.3
diff -c -3 -p -r2.3 tree-ssa-alias.c
*** tree-ssa-alias.c 14 May 2004 02:29:23 -0000 2.3
--- tree-ssa-alias.c 15 May 2004 18:51:26 -0000
*************** static void
*** 1919,1925 ****
dump_alias_stats (FILE *file)
{
const char *funcname
! = (*lang_hooks.decl_printable_name) (current_function_decl, 2);
fprintf (file, "\nAlias statistics for %s\n\n", funcname);
fprintf (file, "Total alias queries:\t%u\n", alias_stats.alias_queries);
fprintf (file, "Total alias mayalias results:\t%u\n",
--- 1919,1925 ----
dump_alias_stats (FILE *file)
{
const char *funcname
! = lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "\nAlias statistics for %s\n\n", funcname);
fprintf (file, "Total alias queries:\t%u\n", alias_stats.alias_queries);
fprintf (file, "Total alias mayalias results:\t%u\n",
*************** dump_alias_info (FILE *file)
*** 1948,1954 ****
{
size_t i;
const char *funcname
! = (*lang_hooks.decl_printable_name) (current_function_decl, 2);
fprintf (file, "\nAlias information for %s\n\n", funcname);
--- 1948,1954 ----
{
size_t i;
const char *funcname
! = lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "\nAlias information for %s\n\n", funcname);
*************** dump_points_to_info (FILE *file)
*** 2031,2037 ****
block_stmt_iterator si;
size_t i;
const char *fname =
! (*lang_hooks.decl_printable_name) (current_function_decl, 2);
fprintf (file, "\n\nPointed-to sets for pointers in %s\n\n", fname);
--- 2031,2037 ----
block_stmt_iterator si;
size_t i;
const char *fname =
! lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "\n\nPointed-to sets for pointers in %s\n\n", fname);
Index: objc/objc-act.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/objc/objc-act.c,v
retrieving revision 1.213
diff -c -3 -p -r1.213 objc-act.c
*** objc/objc-act.c 13 May 2004 06:40:38 -0000 1.213
--- objc/objc-act.c 15 May 2004 18:51:28 -0000
*************** objc_build_try_enter_fragment (void)
*** 2825,2832 ****
cond = build_unary_op (TRUTH_NOT_EXPR,
build_function_call (objc_setjmp_decl, func_params),
0);
! c_expand_start_cond ((*lang_hooks.truthvalue_conversion) (cond),
! 0, if_stmt);
objc_enter_block ();
}
--- 2825,2831 ----
cond = build_unary_op (TRUTH_NOT_EXPR,
build_function_call (objc_setjmp_decl, func_params),
0);
! c_expand_start_cond (lang_hooks.truthvalue_conversion (cond), 0, if_stmt);
objc_enter_block ();
}
*************** objc_build_try_epilogue (int also_catch_
*** 2953,2959 ****
val_stack_push (&catch_count_stack, 1);
if_stmt = c_begin_if_stmt ();
if_nesting_count++;
! c_expand_start_cond ((*lang_hooks.truthvalue_conversion) (boolean_false_node),
0, if_stmt);
objc_enter_block ();
--- 2952,2958 ----
val_stack_push (&catch_count_stack, 1);
if_stmt = c_begin_if_stmt ();
if_nesting_count++;
! c_expand_start_cond (lang_hooks.truthvalue_conversion (boolean_false_node),
0, if_stmt);
objc_enter_block ();
*************** objc_build_catch_stmt (tree catch_expr)
*** 3043,3050 ****
cond = build_function_call (objc_exception_match_decl, func_params);
}
! c_expand_start_cond ((*lang_hooks.truthvalue_conversion) (cond),
! 0, if_stmt);
objc_enter_block ();
objc_declare_variable (RID_REGISTER, var_name,
build_pointer_type (var_type),
--- 3042,3048 ----
cond = build_function_call (objc_exception_match_decl, func_params);
}
! c_expand_start_cond (lang_hooks.truthvalue_conversion (cond), 0, if_stmt);
objc_enter_block ();
objc_declare_variable (RID_REGISTER, var_name,
build_pointer_type (var_type),
*************** objc_build_finally_prologue (void)
*** 3113,3122 ****
tree if_stmt = c_begin_if_stmt ();
if_nesting_count++;
! c_expand_start_cond ((*lang_hooks.truthvalue_conversion)
! (build_unary_op
! (TRUTH_NOT_EXPR,
! TREE_VALUE (objc_rethrow_exception), 0)),
0, if_stmt);
objc_enter_block ();
objc_build_try_exit_fragment ();
--- 3111,3120 ----
tree if_stmt = c_begin_if_stmt ();
if_nesting_count++;
! c_expand_start_cond (lang_hooks.truthvalue_conversion
! (build_unary_op (TRUTH_NOT_EXPR,
! TREE_VALUE (objc_rethrow_exception),
! 0)),
0, if_stmt);
objc_enter_block ();
objc_build_try_exit_fragment ();
*************** objc_build_finally_epilogue (void)
*** 3141,3147 ****
if_nesting_count++;
c_expand_start_cond
! ((*lang_hooks.truthvalue_conversion) (TREE_VALUE (objc_rethrow_exception)),
0, if_stmt);
objc_enter_block ();
objc_build_throw_stmt (TREE_VALUE (objc_rethrow_exception));
--- 3139,3145 ----
if_nesting_count++;
c_expand_start_cond
! (lang_hooks.truthvalue_conversion (TREE_VALUE (objc_rethrow_exception)),
0, if_stmt);
objc_enter_block ();
objc_build_throw_stmt (TREE_VALUE (objc_rethrow_exception));