Skip to content

R
riscv-gcc-1
Commit 673fda6b by Steven Bosscher Committed by Steven Bosscher
Options

c-gimplify.c (c_genericize): Replace calls via (*lang_hooks.foo) with lang_hooks.foo. 

	* 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 ().

From-SVN: r81907
parent fb0e7ec0
Showing with 90 additions and 58 deletions
gcc/ChangeLog
2004-05-15 Steven Bosscher <stevenb@suse.de>
* 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 ().
2004-05-15 Roger Sayle <roger@eyesopen.com> 2004-05-15 Roger Sayle <roger@eyesopen.com>
* builtins.c (simplify_builtin_strcpy): Avoid use of chainon, so * builtins.c (simplify_builtin_strcpy): Avoid use of chainon, so
......
gcc/c-gimplify.c
...@@ -142,7 +142,7 @@ c_genericize (tree fndecl) ...@@ -142,7 +142,7 @@ c_genericize (tree fndecl)
if (dump_file) if (dump_file)
{ {
fprintf (dump_file, "\n;; Function %s", fprintf (dump_file, "\n;; Function %s",
(*lang_hooks.decl_printable_name) (fndecl, 2)); lang_hooks.decl_printable_name (fndecl, 2));
fprintf (dump_file, " (%s)\n", fprintf (dump_file, " (%s)\n",
IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (fndecl))); IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (fndecl)));
fprintf (dump_file, ";; enabled by -%s\n", dump_flag_name (TDI_original)); fprintf (dump_file, ";; enabled by -%s\n", dump_flag_name (TDI_original));
......
gcc/c-parse.in
...@@ -566,21 +566,21 @@ expr_no_commas: ...@@ -566,21 +566,21 @@ expr_no_commas:
| expr_no_commas '^' expr_no_commas | expr_no_commas '^' expr_no_commas
{ $$ = parser_build_binary_op ($2, $1, $3); } { $$ = parser_build_binary_op ($2, $1, $3); }
| expr_no_commas ANDAND | expr_no_commas ANDAND
{ $1 = (*lang_hooks.truthvalue_conversion) { $1 = lang_hooks.truthvalue_conversion
(default_conversion ($1)); (default_conversion ($1));
skip_evaluation += $1 == truthvalue_false_node; } skip_evaluation += $1 == truthvalue_false_node; }
expr_no_commas expr_no_commas
{ skip_evaluation -= $1 == truthvalue_false_node; { skip_evaluation -= $1 == truthvalue_false_node;
$$ = parser_build_binary_op (TRUTH_ANDIF_EXPR, $1, $4); } $$ = parser_build_binary_op (TRUTH_ANDIF_EXPR, $1, $4); }
| expr_no_commas OROR | expr_no_commas OROR
{ $1 = (*lang_hooks.truthvalue_conversion) { $1 = lang_hooks.truthvalue_conversion
(default_conversion ($1)); (default_conversion ($1));
skip_evaluation += $1 == truthvalue_true_node; } skip_evaluation += $1 == truthvalue_true_node; }
expr_no_commas expr_no_commas
{ skip_evaluation -= $1 == truthvalue_true_node; { skip_evaluation -= $1 == truthvalue_true_node;
$$ = parser_build_binary_op (TRUTH_ORIF_EXPR, $1, $4); } $$ = parser_build_binary_op (TRUTH_ORIF_EXPR, $1, $4); }
| expr_no_commas '?' | expr_no_commas '?'
{ $1 = (*lang_hooks.truthvalue_conversion) { $1 = lang_hooks.truthvalue_conversion
(default_conversion ($1)); (default_conversion ($1));
skip_evaluation += $1 == truthvalue_false_node; } skip_evaluation += $1 == truthvalue_false_node; }
expr ':' expr ':'
...@@ -594,7 +594,7 @@ expr_no_commas: ...@@ -594,7 +594,7 @@ expr_no_commas:
pedwarn ("ISO C forbids omitting the middle term of a ?: expression"); pedwarn ("ISO C forbids omitting the middle term of a ?: expression");
/* Make sure first operand is calculated only once. */ /* Make sure first operand is calculated only once. */
$<ttype>2 = save_expr (default_conversion ($1)); $<ttype>2 = save_expr (default_conversion ($1));
$1 = (*lang_hooks.truthvalue_conversion) ($<ttype>2); $1 = lang_hooks.truthvalue_conversion ($<ttype>2);
skip_evaluation += $1 == truthvalue_true_node; } skip_evaluation += $1 == truthvalue_true_node; }
':' expr_no_commas ':' expr_no_commas
{ skip_evaluation -= $1 == truthvalue_true_node; { skip_evaluation -= $1 == truthvalue_true_node;
...@@ -2141,7 +2141,7 @@ if_prefix: ...@@ -2141,7 +2141,7 @@ if_prefix:
IF IF
{ $<ttype>$ = c_begin_if_stmt (); } { $<ttype>$ = c_begin_if_stmt (); }
'(' expr ')' '(' expr ')'
{ c_expand_start_cond ((*lang_hooks.truthvalue_conversion) ($4), { c_expand_start_cond (lang_hooks.truthvalue_conversion ($4),
compstmt_count,$<ttype>2); compstmt_count,$<ttype>2);
$<itype>$ = stmt_count; $<itype>$ = stmt_count;
if_stmt_locus = $<location>-1; } if_stmt_locus = $<location>-1; }
...@@ -2247,16 +2247,16 @@ select_or_iter_stmt: ...@@ -2247,16 +2247,16 @@ select_or_iter_stmt:
$<ttype>$ = c_begin_while_stmt (); } $<ttype>$ = c_begin_while_stmt (); }
'(' expr ')' '(' expr ')'
{ c_in_iteration_stmt++; { c_in_iteration_stmt++;
$4 = (*lang_hooks.truthvalue_conversion) ($4); $4 = lang_hooks.truthvalue_conversion ($4);
c_finish_while_stmt_cond c_finish_while_stmt_cond
((*lang_hooks.truthvalue_conversion) ($4), $<ttype>2); (lang_hooks.truthvalue_conversion ($4), $<ttype>2);
$<ttype>$ = add_stmt ($<ttype>2); } $<ttype>$ = add_stmt ($<ttype>2); }
c99_block_lineno_labeled_stmt c99_block_lineno_labeled_stmt
{ c_in_iteration_stmt--; { c_in_iteration_stmt--;
RECHAIN_STMTS ($<ttype>6, WHILE_BODY ($<ttype>6)); } RECHAIN_STMTS ($<ttype>6, WHILE_BODY ($<ttype>6)); }
| do_stmt_start | do_stmt_start
'(' expr ')' ';' '(' expr ')' ';'
{ DO_COND ($1) = (*lang_hooks.truthvalue_conversion) ($3); } { DO_COND ($1) = lang_hooks.truthvalue_conversion ($3); }
| do_stmt_start error | do_stmt_start error
{ } { }
| FOR | FOR
...@@ -2269,7 +2269,7 @@ select_or_iter_stmt: ...@@ -2269,7 +2269,7 @@ select_or_iter_stmt:
xexpr ';' xexpr ';'
{ if ($6) { if ($6)
FOR_COND ($<ttype>2) FOR_COND ($<ttype>2)
= (*lang_hooks.truthvalue_conversion) ($6); } = lang_hooks.truthvalue_conversion ($6); }
xexpr ')' xexpr ')'
{ c_in_iteration_stmt++; { c_in_iteration_stmt++;
FOR_EXPR ($<ttype>2) = $9; } FOR_EXPR ($<ttype>2) = $9; }
......
gcc/expr.c
...@@ -6211,7 +6211,7 @@ expand_var (tree var) ...@@ -6211,7 +6211,7 @@ expand_var (tree var)
set_mem_attributes (x, var, 1); set_mem_attributes (x, var, 1);
SET_DECL_RTL (var, x); SET_DECL_RTL (var, x);
} }
else if ((*lang_hooks.expand_decl) (var)) else if (lang_hooks.expand_decl (var))
/* OK. */; /* OK. */;
else if (TREE_CODE (var) == VAR_DECL && !TREE_STATIC (var)) else if (TREE_CODE (var) == VAR_DECL && !TREE_STATIC (var))
expand_decl (var); expand_decl (var);
...@@ -6860,7 +6860,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode, ...@@ -6860,7 +6860,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
{ {
if (TREE_USED (block)) if (TREE_USED (block))
abort (); abort ();
(*lang_hooks.decls.insert_block) (block); lang_hooks.decls.insert_block (block);
} }
} }
...@@ -7617,8 +7617,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode, ...@@ -7617,8 +7617,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
{ {
if (DECL_BUILT_IN_CLASS (TREE_OPERAND (TREE_OPERAND (exp, 0), 0)) if (DECL_BUILT_IN_CLASS (TREE_OPERAND (TREE_OPERAND (exp, 0), 0))
== BUILT_IN_FRONTEND) == BUILT_IN_FRONTEND)
/* ??? Use (*fun) form because expand_expr is a macro. */ return lang_hooks.expand_expr (exp, original_target,
return (*lang_hooks.expand_expr) (exp, original_target,
tmode, modifier, tmode, modifier,
alt_rtl); alt_rtl);
else else
...@@ -9365,8 +9364,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode, ...@@ -9365,8 +9364,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
return const0_rtx; return const0_rtx;
default: default:
/* ??? Use (*fun) form because expand_expr is a macro. */ return lang_hooks.expand_expr (exp, original_target, tmode,
return (*lang_hooks.expand_expr) (exp, original_target, tmode,
modifier, alt_rtl); modifier, alt_rtl);
} }
......
gcc/expr.h
...@@ -508,13 +508,19 @@ extern rtx store_expr (tree, rtx, int); ...@@ -508,13 +508,19 @@ extern rtx store_expr (tree, rtx, int);
Useful after calling expand_expr with 1 as sum_ok. */ Useful after calling expand_expr with 1 as sum_ok. */
extern rtx force_operand (rtx, rtx); 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. /* Generate code for computing expression EXP.
An rtx for the computed value is returned. The value is never null. An rtx for the computed value is returned. The value is never null.
In the case of a void EXP, const0_rtx is returned. */ In the case of a void EXP, const0_rtx is returned. */
#define expand_expr(EXP, TARGET, MODE, MODIFIER) \ static inline rtx
expand_expr_real((EXP), (TARGET), (MODE), (MODIFIER), NULL) expand_expr (tree exp, rtx target, enum machine_mode mode,
extern rtx expand_expr_real (tree, rtx, enum machine_mode, enum expand_modifier modifier)
enum expand_modifier, rtx *); {
return expand_expr_real(exp, target, mode, modifier, NULL);
}
extern void expand_var (tree); extern void expand_var (tree);
......
gcc/fold-const.c
...@@ -9372,8 +9372,8 @@ fold_relational_hi_lo (enum tree_code *code_p, const tree type, tree *op0_p, ...@@ -9372,8 +9372,8 @@ fold_relational_hi_lo (enum tree_code *code_p, const tree type, tree *op0_p,
if (code == LE_EXPR || code == GT_EXPR) if (code == LE_EXPR || code == GT_EXPR)
{ {
tree st0, st1, exp, retval; tree st0, st1, exp, retval;
st0 = (*lang_hooks.types.signed_type) (TREE_TYPE (op0)); st0 = lang_hooks.types.signed_type (TREE_TYPE (op0));
st1 = (*lang_hooks.types.signed_type) (TREE_TYPE (op1)); st1 = lang_hooks.types.signed_type (TREE_TYPE (op1));
exp = build (code == LE_EXPR ? GE_EXPR: LT_EXPR, exp = build (code == LE_EXPR ? GE_EXPR: LT_EXPR,
type, type,
...@@ -10013,7 +10013,7 @@ fold_relational_const (enum tree_code code, tree type, tree op0, tree op1) ...@@ -10013,7 +10013,7 @@ fold_relational_const (enum tree_code code, tree type, tree op0, tree op1)
TREE_TYPE (tem) = type; TREE_TYPE (tem) = type;
if (TREE_CODE (type) == BOOLEAN_TYPE) if (TREE_CODE (type) == BOOLEAN_TYPE)
return (*lang_hooks.truthvalue_conversion) (tem); return lang_hooks.truthvalue_conversion (tem);
return tem; return tem;
} }
......
gcc/gimplify.c
...@@ -2229,7 +2229,7 @@ gimple_boolify (tree expr) ...@@ -2229,7 +2229,7 @@ gimple_boolify (tree expr)
/* If this is the predicate of a COND_EXPR, it might not even be a /* If this is the predicate of a COND_EXPR, it might not even be a
truthvalue yet. */ truthvalue yet. */
expr = (*lang_hooks.truthvalue_conversion) (expr); expr = lang_hooks.truthvalue_conversion (expr);
switch (TREE_CODE (expr)) switch (TREE_CODE (expr))
{ {
...@@ -2693,7 +2693,7 @@ gimplify_addr_expr (tree *expr_p, tree *pre_p, tree *post_p) ...@@ -2693,7 +2693,7 @@ gimplify_addr_expr (tree *expr_p, tree *pre_p, tree *post_p)
recompute_tree_invarant_for_addr_expr (expr); recompute_tree_invarant_for_addr_expr (expr);
/* Mark the RHS addressable. */ /* Mark the RHS addressable. */
(*lang_hooks.mark_addressable) (TREE_OPERAND (expr, 0)); lang_hooks.mark_addressable (TREE_OPERAND (expr, 0));
} }
break; break;
} }
...@@ -2736,7 +2736,7 @@ gimplify_asm_expr (tree *expr_p, tree *pre_p, tree *post_p) ...@@ -2736,7 +2736,7 @@ gimplify_asm_expr (tree *expr_p, tree *pre_p, tree *post_p)
&allows_mem, &allows_reg, &is_inout); &allows_mem, &allows_reg, &is_inout);
if (!allows_reg && allows_mem) if (!allows_reg && allows_mem)
(*lang_hooks.mark_addressable) (TREE_VALUE (link)); lang_hooks.mark_addressable (TREE_VALUE (link));
tret = gimplify_expr (&TREE_VALUE (link), pre_p, post_p, tret = gimplify_expr (&TREE_VALUE (link), pre_p, post_p,
is_inout ? is_gimple_min_lval : is_gimple_lvalue, is_inout ? is_gimple_min_lval : is_gimple_lvalue,
...@@ -2786,7 +2786,7 @@ gimplify_asm_expr (tree *expr_p, tree *pre_p, tree *post_p) ...@@ -2786,7 +2786,7 @@ gimplify_asm_expr (tree *expr_p, tree *pre_p, tree *post_p)
/* If the operand is a memory input, it should be an lvalue. */ /* If the operand is a memory input, it should be an lvalue. */
if (!allows_reg && allows_mem) if (!allows_reg && allows_mem)
{ {
(*lang_hooks.mark_addressable) (TREE_VALUE (link)); lang_hooks.mark_addressable (TREE_VALUE (link));
tret = gimplify_expr (&TREE_VALUE (link), pre_p, post_p, tret = gimplify_expr (&TREE_VALUE (link), pre_p, post_p,
is_gimple_lvalue, fb_lvalue | fb_mayfail); is_gimple_lvalue, fb_lvalue | fb_mayfail);
if (tret == GS_ERROR) if (tret == GS_ERROR)
...@@ -3100,7 +3100,7 @@ gimplify_expr (tree *expr_p, tree *pre_p, tree *post_p, ...@@ -3100,7 +3100,7 @@ gimplify_expr (tree *expr_p, tree *pre_p, tree *post_p,
} }
/* Do any language-specific gimplification. */ /* Do any language-specific gimplification. */
ret = (*lang_hooks.gimplify_expr) (expr_p, pre_p, post_p); ret = lang_hooks.gimplify_expr (expr_p, pre_p, post_p);
if (ret == GS_OK) if (ret == GS_OK)
{ {
if (*expr_p == NULL_TREE) if (*expr_p == NULL_TREE)
......
gcc/objc/objc-act.c
...@@ -2825,8 +2825,7 @@ objc_build_try_enter_fragment (void) ...@@ -2825,8 +2825,7 @@ objc_build_try_enter_fragment (void)
cond = build_unary_op (TRUTH_NOT_EXPR, cond = build_unary_op (TRUTH_NOT_EXPR,
build_function_call (objc_setjmp_decl, func_params), build_function_call (objc_setjmp_decl, func_params),
0); 0);
c_expand_start_cond ((*lang_hooks.truthvalue_conversion) (cond), c_expand_start_cond (lang_hooks.truthvalue_conversion (cond), 0, if_stmt);
0, if_stmt);
objc_enter_block (); objc_enter_block ();
} }
...@@ -2953,7 +2952,7 @@ objc_build_try_epilogue (int also_catch_prologue) ...@@ -2953,7 +2952,7 @@ objc_build_try_epilogue (int also_catch_prologue)
val_stack_push (&catch_count_stack, 1); val_stack_push (&catch_count_stack, 1);
if_stmt = c_begin_if_stmt (); if_stmt = c_begin_if_stmt ();
if_nesting_count++; if_nesting_count++;
c_expand_start_cond ((*lang_hooks.truthvalue_conversion) (boolean_false_node), c_expand_start_cond (lang_hooks.truthvalue_conversion (boolean_false_node),
0, if_stmt); 0, if_stmt);
objc_enter_block (); objc_enter_block ();
...@@ -3043,8 +3042,7 @@ objc_build_catch_stmt (tree catch_expr) ...@@ -3043,8 +3042,7 @@ objc_build_catch_stmt (tree catch_expr)
cond = build_function_call (objc_exception_match_decl, func_params); cond = build_function_call (objc_exception_match_decl, func_params);
} }
c_expand_start_cond ((*lang_hooks.truthvalue_conversion) (cond), c_expand_start_cond (lang_hooks.truthvalue_conversion (cond), 0, if_stmt);
0, if_stmt);
objc_enter_block (); objc_enter_block ();
objc_declare_variable (RID_REGISTER, var_name, objc_declare_variable (RID_REGISTER, var_name,
build_pointer_type (var_type), build_pointer_type (var_type),
...@@ -3113,10 +3111,10 @@ objc_build_finally_prologue (void) ...@@ -3113,10 +3111,10 @@ objc_build_finally_prologue (void)
tree if_stmt = c_begin_if_stmt (); tree if_stmt = c_begin_if_stmt ();
if_nesting_count++; if_nesting_count++;
c_expand_start_cond ((*lang_hooks.truthvalue_conversion) c_expand_start_cond (lang_hooks.truthvalue_conversion
(build_unary_op (build_unary_op (TRUTH_NOT_EXPR,
(TRUTH_NOT_EXPR, TREE_VALUE (objc_rethrow_exception),
TREE_VALUE (objc_rethrow_exception), 0)), 0)),
0, if_stmt); 0, if_stmt);
objc_enter_block (); objc_enter_block ();
objc_build_try_exit_fragment (); objc_build_try_exit_fragment ();
...@@ -3141,7 +3139,7 @@ objc_build_finally_epilogue (void) ...@@ -3141,7 +3139,7 @@ objc_build_finally_epilogue (void)
if_nesting_count++; if_nesting_count++;
c_expand_start_cond c_expand_start_cond
((*lang_hooks.truthvalue_conversion) (TREE_VALUE (objc_rethrow_exception)), (lang_hooks.truthvalue_conversion (TREE_VALUE (objc_rethrow_exception)),
0, if_stmt); 0, if_stmt);
objc_enter_block (); objc_enter_block ();
objc_build_throw_stmt (TREE_VALUE (objc_rethrow_exception)); objc_build_throw_stmt (TREE_VALUE (objc_rethrow_exception));
......
gcc/tree-cfg.c
...@@ -2141,7 +2141,7 @@ dump_tree_cfg (FILE *file, int flags) ...@@ -2141,7 +2141,7 @@ dump_tree_cfg (FILE *file, int flags)
if (flags & TDF_DETAILS) if (flags & TDF_DETAILS)
{ {
const char *funcname const char *funcname
= (*lang_hooks.decl_printable_name) (current_function_decl, 2); = lang_hooks.decl_printable_name (current_function_decl, 2);
fputc ('\n', file); fputc ('\n', file);
fprintf (file, ";; Function %s\n\n", funcname); fprintf (file, ";; Function %s\n\n", funcname);
...@@ -2172,7 +2172,7 @@ dump_cfg_stats (FILE *file) ...@@ -2172,7 +2172,7 @@ dump_cfg_stats (FILE *file)
const char * const fmt_str_1 = "%-30s%13lu%11lu%c\n"; const char * const fmt_str_1 = "%-30s%13lu%11lu%c\n";
const char * const fmt_str_3 = "%-43s%11lu%c\n"; const char * const fmt_str_3 = "%-43s%11lu%c\n";
const char *funcname const char *funcname
= (*lang_hooks.decl_printable_name) (current_function_decl, 2); = lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "\nCFG Statistics for %s\n\n", funcname); fprintf (file, "\nCFG Statistics for %s\n\n", funcname);
...@@ -2237,7 +2237,7 @@ tree_cfg2vcg (FILE *file) ...@@ -2237,7 +2237,7 @@ tree_cfg2vcg (FILE *file)
edge e; edge e;
basic_block bb; basic_block bb;
const char *funcname const char *funcname
= (*lang_hooks.decl_printable_name) (current_function_decl, 2); = lang_hooks.decl_printable_name (current_function_decl, 2);
/* Write the file header. */ /* Write the file header. */
fprintf (file, "graph: { title: \"%s\"\n", funcname); fprintf (file, "graph: { title: \"%s\"\n", funcname);
...@@ -4062,7 +4062,7 @@ dump_function_to_file (tree fn, FILE *file, int flags) ...@@ -4062,7 +4062,7 @@ dump_function_to_file (tree fn, FILE *file, int flags)
basic_block bb; basic_block bb;
tree chain; tree chain;
fprintf (file, "%s (", (*lang_hooks.decl_printable_name) (fn, 2)); fprintf (file, "%s (", lang_hooks.decl_printable_name (fn, 2));
arg = DECL_ARGUMENTS (fn); arg = DECL_ARGUMENTS (fn);
while (arg) while (arg)
......
gcc/tree-dfa.c
...@@ -605,7 +605,7 @@ dump_immediate_uses (FILE *file) ...@@ -605,7 +605,7 @@ dump_immediate_uses (FILE *file)
basic_block bb; basic_block bb;
block_stmt_iterator si; block_stmt_iterator si;
const char *funcname const char *funcname
= (*lang_hooks.decl_printable_name) (current_function_decl, 2); = lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "\nDef-use edges for function %s\n", funcname); fprintf (file, "\nDef-use edges for function %s\n", funcname);
...@@ -682,7 +682,7 @@ dump_dfa_stats (FILE *file) ...@@ -682,7 +682,7 @@ dump_dfa_stats (FILE *file)
const char * const fmt_str_1 = "%-30s%13lu%11lu%c\n"; const char * const fmt_str_1 = "%-30s%13lu%11lu%c\n";
const char * const fmt_str_3 = "%-43s%11lu%c\n"; const char * const fmt_str_3 = "%-43s%11lu%c\n";
const char *funcname const char *funcname
= (*lang_hooks.decl_printable_name) (current_function_decl, 2); = lang_hooks.decl_printable_name (current_function_decl, 2);
collect_dfa_stats (&dfa_stats); collect_dfa_stats (&dfa_stats);
......
gcc/tree-inline.c
...@@ -394,7 +394,7 @@ remap_block (tree *block, inline_data *id) ...@@ -394,7 +394,7 @@ remap_block (tree *block, inline_data *id)
/* We're building a clone; DECL_INITIAL is still /* We're building a clone; DECL_INITIAL is still
error_mark_node, and current_binding_level is the parm error_mark_node, and current_binding_level is the parm
binding level. */ binding level. */
(*lang_hooks.decls.insert_block) (new_block); lang_hooks.decls.insert_block (new_block);
else else
{ {
/* Attach this new block after the DECL_INITIAL block for the /* Attach this new block after the DECL_INITIAL block for the
...@@ -1930,7 +1930,7 @@ save_body (tree fn, tree *arg_copy) ...@@ -1930,7 +1930,7 @@ save_body (tree fn, tree *arg_copy)
for (parg = arg_copy; *parg; parg = &TREE_CHAIN (*parg)) for (parg = arg_copy; *parg; parg = &TREE_CHAIN (*parg))
{ {
tree new = copy_node (*parg); tree new = copy_node (*parg);
(*lang_hooks.dup_lang_specific_decl) (new); lang_hooks.dup_lang_specific_decl (new);
DECL_ABSTRACT_ORIGIN (new) = DECL_ORIGIN (*parg); DECL_ABSTRACT_ORIGIN (new) = DECL_ORIGIN (*parg);
insert_decl_map (&id, *parg, new); insert_decl_map (&id, *parg, new);
TREE_CHAIN (new) = TREE_CHAIN (*parg); TREE_CHAIN (new) = TREE_CHAIN (*parg);
...@@ -2017,7 +2017,7 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, void *htab_) ...@@ -2017,7 +2017,7 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, void *htab_)
return NULL_TREE; return NULL_TREE;
} }
result = (*lang_hooks.tree_inlining.walk_subtrees) (tp, &walk_subtrees, func, result = lang_hooks.tree_inlining.walk_subtrees (tp, &walk_subtrees, func,
data, htab); data, htab);
if (result || ! walk_subtrees) if (result || ! walk_subtrees)
return result; return result;
...@@ -2056,7 +2056,7 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, void *htab_) ...@@ -2056,7 +2056,7 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, void *htab_)
} }
#endif #endif
if ((*lang_hooks.tree_inlining.tree_chain_matters_p) (*tp)) if (lang_hooks.tree_inlining.tree_chain_matters_p (*tp))
/* Check our siblings. */ /* Check our siblings. */
WALK_SUBTREE_TAIL (TREE_CHAIN (*tp)); WALK_SUBTREE_TAIL (TREE_CHAIN (*tp));
} }
......
gcc/tree-into-ssa.c
...@@ -570,7 +570,7 @@ dump_tree_ssa (FILE *file) ...@@ -570,7 +570,7 @@ dump_tree_ssa (FILE *file)
{ {
basic_block bb; basic_block bb;
const char *funcname const char *funcname
= (*lang_hooks.decl_printable_name) (current_function_decl, 2); = lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "SSA information for %s\n\n", funcname); fprintf (file, "SSA information for %s\n\n", funcname);
......
gcc/tree-mudflap.c
...@@ -344,7 +344,7 @@ mf_varname_tree (tree decl) ...@@ -344,7 +344,7 @@ mf_varname_tree (tree decl)
{ {
const char *funcname = NULL; const char *funcname = NULL;
if (DECL_NAME (current_function_decl)) if (DECL_NAME (current_function_decl))
funcname = (*lang_hooks.decl_printable_name) (current_function_decl, 1); funcname = lang_hooks.decl_printable_name (current_function_decl, 1);
if (funcname == NULL) if (funcname == NULL)
funcname = "anonymous fn"; funcname = "anonymous fn";
...@@ -369,7 +369,7 @@ mf_varname_tree (tree decl) ...@@ -369,7 +369,7 @@ mf_varname_tree (tree decl)
} }
if (declname == NULL) if (declname == NULL)
declname = (*lang_hooks.decl_printable_name) (decl, 3); declname = lang_hooks.decl_printable_name (decl, 3);
if (declname == NULL) if (declname == NULL)
declname = "<unnamed variable>"; declname = "<unnamed variable>";
...@@ -415,7 +415,7 @@ mf_file_function_line_tree (location_t *locus) ...@@ -415,7 +415,7 @@ mf_file_function_line_tree (location_t *locus)
colon = line = ""; colon = line = "";
/* Add (FUNCTION). */ /* Add (FUNCTION). */
name = (*lang_hooks.decl_printable_name) (current_function_decl, 1); name = lang_hooks.decl_printable_name (current_function_decl, 1);
if (name) if (name)
{ {
op = " ("; op = " (";
......
gcc/tree-optimize.c
...@@ -386,7 +386,7 @@ execute_one_pass (struct tree_opt_pass *pass) ...@@ -386,7 +386,7 @@ execute_one_pass (struct tree_opt_pass *pass)
if (dump_file) if (dump_file)
{ {
const char *dname, *aname; const char *dname, *aname;
dname = (*lang_hooks.decl_printable_name) (current_function_decl, 2); dname = lang_hooks.decl_printable_name (current_function_decl, 2);
aname = (IDENTIFIER_POINTER aname = (IDENTIFIER_POINTER
(DECL_ASSEMBLER_NAME (current_function_decl))); (DECL_ASSEMBLER_NAME (current_function_decl)));
fprintf (dump_file, "\n;; Function %s (%s)\n\n", dname, aname); fprintf (dump_file, "\n;; Function %s (%s)\n\n", dname, aname);
......
gcc/tree-pretty-print.c
...@@ -52,8 +52,8 @@ static void dump_generic_bb_buff (pretty_printer *, basic_block, int, int); ...@@ -52,8 +52,8 @@ static void dump_generic_bb_buff (pretty_printer *, basic_block, int, int);
#define PRINT_FUNCTION_NAME(NODE) pp_printf \ #define PRINT_FUNCTION_NAME(NODE) pp_printf \
(buffer, "%s", TREE_CODE (NODE) == NOP_EXPR ? \ (buffer, "%s", TREE_CODE (NODE) == NOP_EXPR ? \
(*lang_hooks.decl_printable_name) (TREE_OPERAND (NODE, 0), 1) : \ lang_hooks.decl_printable_name (TREE_OPERAND (NODE, 0), 1) : \
(*lang_hooks.decl_printable_name) (NODE, 1)) lang_hooks.decl_printable_name (NODE, 1))
#define MASK_POINTER(P) ((unsigned)((unsigned long)(P) & 0xffff)) #define MASK_POINTER(P) ((unsigned)((unsigned long)(P) & 0xffff))
......
gcc/tree-ssa-alias.c
...@@ -1919,7 +1919,7 @@ static void ...@@ -1919,7 +1919,7 @@ static void
dump_alias_stats (FILE *file) dump_alias_stats (FILE *file)
{ {
const char *funcname const char *funcname
= (*lang_hooks.decl_printable_name) (current_function_decl, 2); = lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "\nAlias statistics for %s\n\n", funcname); 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 queries:\t%u\n", alias_stats.alias_queries);
fprintf (file, "Total alias mayalias results:\t%u\n", fprintf (file, "Total alias mayalias results:\t%u\n",
...@@ -1948,7 +1948,7 @@ dump_alias_info (FILE *file) ...@@ -1948,7 +1948,7 @@ dump_alias_info (FILE *file)
{ {
size_t i; size_t i;
const char *funcname const char *funcname
= (*lang_hooks.decl_printable_name) (current_function_decl, 2); = lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "\nAlias information for %s\n\n", funcname); fprintf (file, "\nAlias information for %s\n\n", funcname);
...@@ -2031,7 +2031,7 @@ dump_points_to_info (FILE *file) ...@@ -2031,7 +2031,7 @@ dump_points_to_info (FILE *file)
block_stmt_iterator si; block_stmt_iterator si;
size_t i; size_t i;
const char *fname = const char *fname =
(*lang_hooks.decl_printable_name) (current_function_decl, 2); lang_hooks.decl_printable_name (current_function_decl, 2);
fprintf (file, "\n\nPointed-to sets for pointers in %s\n\n", fname); fprintf (file, "\n\nPointed-to sets for pointers in %s\n\n", fname);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment