aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog30
-rw-r--r--gcc/c-gimplify.c2
-rw-r--r--gcc/c-parse.in18
-rw-r--r--gcc/expr.c16
-rw-r--r--gcc/expr.h14
-rw-r--r--gcc/fold-const.c6
-rw-r--r--gcc/gimplify.c10
-rw-r--r--gcc/objc/objc-act.c18
-rw-r--r--gcc/tree-cfg.c8
-rw-r--r--gcc/tree-dfa.c4
-rw-r--r--gcc/tree-inline.c10
-rw-r--r--gcc/tree-into-ssa.c2
-rw-r--r--gcc/tree-mudflap.c6
-rw-r--r--gcc/tree-optimize.c2
-rw-r--r--gcc/tree-pretty-print.c4
-rw-r--r--gcc/tree-ssa-alias.c6
16 files changed, 94 insertions, 62 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b1ef2c483a..9ac7ef5d647 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,33 @@
+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>
* builtins.c (simplify_builtin_strcpy): Avoid use of chainon, so
diff --git a/gcc/c-gimplify.c b/gcc/c-gimplify.c
index 49b3a671b75..9934c2feac5 100644
--- a/gcc/c-gimplify.c
+++ b/gcc/c-gimplify.c
@@ -142,7 +142,7 @@ c_genericize (tree fndecl)
if (dump_file)
{
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",
IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (fndecl)));
fprintf (dump_file, ";; enabled by -%s\n", dump_flag_name (TDI_original));
diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index 07854c48d6b..ed187cb80de 100644
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -566,21 +566,21 @@ expr_no_commas:
| expr_no_commas '^' expr_no_commas
{ $$ = parser_build_binary_op ($2, $1, $3); }
| expr_no_commas ANDAND
- { $1 = (*lang_hooks.truthvalue_conversion)
+ { $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)
+ { $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)
+ { $1 = lang_hooks.truthvalue_conversion
(default_conversion ($1));
skip_evaluation += $1 == truthvalue_false_node; }
expr ':'
@@ -594,7 +594,7 @@ expr_no_commas:
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);
+ $1 = lang_hooks.truthvalue_conversion ($<ttype>2);
skip_evaluation += $1 == truthvalue_true_node; }
':' expr_no_commas
{ skip_evaluation -= $1 == truthvalue_true_node;
@@ -2141,7 +2141,7 @@ if_prefix:
IF
{ $<ttype>$ = c_begin_if_stmt (); }
'(' expr ')'
- { c_expand_start_cond ((*lang_hooks.truthvalue_conversion) ($4),
+ { c_expand_start_cond (lang_hooks.truthvalue_conversion ($4),
compstmt_count,$<ttype>2);
$<itype>$ = stmt_count;
if_stmt_locus = $<location>-1; }
@@ -2247,16 +2247,16 @@ select_or_iter_stmt:
$<ttype>$ = c_begin_while_stmt (); }
'(' expr ')'
{ c_in_iteration_stmt++;
- $4 = (*lang_hooks.truthvalue_conversion) ($4);
+ $4 = lang_hooks.truthvalue_conversion ($4);
c_finish_while_stmt_cond
- ((*lang_hooks.truthvalue_conversion) ($4), $<ttype>2);
+ (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_COND ($1) = lang_hooks.truthvalue_conversion ($3); }
| do_stmt_start error
{ }
| FOR
@@ -2269,7 +2269,7 @@ select_or_iter_stmt:
xexpr ';'
{ if ($6)
FOR_COND ($<ttype>2)
- = (*lang_hooks.truthvalue_conversion) ($6); }
+ = lang_hooks.truthvalue_conversion ($6); }
xexpr ')'
{ c_in_iteration_stmt++;
FOR_EXPR ($<ttype>2) = $9; }
diff --git a/gcc/expr.c b/gcc/expr.c
index 23e128d4704..1f8c3ef70d4 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -6211,7 +6211,7 @@ expand_var (tree var)
set_mem_attributes (x, var, 1);
SET_DECL_RTL (var, x);
}
- else if ((*lang_hooks.expand_decl) (var))
+ else if (lang_hooks.expand_decl (var))
/* OK. */;
else if (TREE_CODE (var) == VAR_DECL && !TREE_STATIC (var))
expand_decl (var);
@@ -6860,7 +6860,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
{
if (TREE_USED (block))
abort ();
- (*lang_hooks.decls.insert_block) (block);
+ lang_hooks.decls.insert_block (block);
}
}
@@ -7617,10 +7617,9 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
{
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);
+ return lang_hooks.expand_expr (exp, original_target,
+ tmode, modifier,
+ alt_rtl);
else
return expand_builtin (exp, target, subtarget, tmode, ignore);
}
@@ -9365,9 +9364,8 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
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);
+ return lang_hooks.expand_expr (exp, original_target, tmode,
+ modifier, alt_rtl);
}
/* Here to do an ordinary binary operator, generating an instruction
diff --git a/gcc/expr.h b/gcc/expr.h
index 002bcfc892d..5c8f9408ba0 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -508,13 +508,19 @@ extern rtx store_expr (tree, rtx, int);
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. */
-#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 *);
+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);
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index ed54ee93bb6..1705fb6b6b2 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -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)
{
tree st0, st1, exp, retval;
- st0 = (*lang_hooks.types.signed_type) (TREE_TYPE (op0));
- st1 = (*lang_hooks.types.signed_type) (TREE_TYPE (op1));
+ 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,
@@ -10013,7 +10013,7 @@ fold_relational_const (enum tree_code code, tree type, tree op0, tree op1)
TREE_TYPE (tem) = type;
if (TREE_CODE (type) == BOOLEAN_TYPE)
- return (*lang_hooks.truthvalue_conversion) (tem);
+ return lang_hooks.truthvalue_conversion (tem);
return tem;
}
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 787dbc34999..907d443dca5 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -2229,7 +2229,7 @@ gimple_boolify (tree expr)
/* If this is the predicate of a COND_EXPR, it might not even be a
truthvalue yet. */
- expr = (*lang_hooks.truthvalue_conversion) (expr);
+ expr = lang_hooks.truthvalue_conversion (expr);
switch (TREE_CODE (expr))
{
@@ -2693,7 +2693,7 @@ gimplify_addr_expr (tree *expr_p, tree *pre_p, tree *post_p)
recompute_tree_invarant_for_addr_expr (expr);
/* Mark the RHS addressable. */
- (*lang_hooks.mark_addressable) (TREE_OPERAND (expr, 0));
+ lang_hooks.mark_addressable (TREE_OPERAND (expr, 0));
}
break;
}
@@ -2736,7 +2736,7 @@ gimplify_asm_expr (tree *expr_p, tree *pre_p, tree *post_p)
&allows_mem, &allows_reg, &is_inout);
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,
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)
/* If the operand is a memory input, it should be an lvalue. */
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,
is_gimple_lvalue, fb_lvalue | fb_mayfail);
if (tret == GS_ERROR)
@@ -3100,7 +3100,7 @@ gimplify_expr (tree *expr_p, tree *pre_p, tree *post_p,
}
/* 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 (*expr_p == NULL_TREE)
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index bec59c061ae..385360a28eb 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -2825,8 +2825,7 @@ objc_build_try_enter_fragment (void)
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);
+ c_expand_start_cond (lang_hooks.truthvalue_conversion (cond), 0, if_stmt);
objc_enter_block ();
}
@@ -2953,7 +2952,7 @@ objc_build_try_epilogue (int also_catch_prologue)
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),
+ c_expand_start_cond (lang_hooks.truthvalue_conversion (boolean_false_node),
0, if_stmt);
objc_enter_block ();
@@ -3043,8 +3042,7 @@ objc_build_catch_stmt (tree catch_expr)
cond = build_function_call (objc_exception_match_decl, func_params);
}
- c_expand_start_cond ((*lang_hooks.truthvalue_conversion) (cond),
- 0, if_stmt);
+ 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),
@@ -3113,10 +3111,10 @@ objc_build_finally_prologue (void)
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)),
+ 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 ();
@@ -3141,7 +3139,7 @@ objc_build_finally_epilogue (void)
if_nesting_count++;
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);
objc_enter_block ();
objc_build_throw_stmt (TREE_VALUE (objc_rethrow_exception));
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 26954e4bd01..9e468f47ccc 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -2141,7 +2141,7 @@ dump_tree_cfg (FILE *file, int flags)
if (flags & TDF_DETAILS)
{
const char *funcname
- = (*lang_hooks.decl_printable_name) (current_function_decl, 2);
+ = lang_hooks.decl_printable_name (current_function_decl, 2);
fputc ('\n', file);
fprintf (file, ";; Function %s\n\n", funcname);
@@ -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_3 = "%-43s%11lu%c\n";
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);
@@ -2237,7 +2237,7 @@ tree_cfg2vcg (FILE *file)
edge e;
basic_block bb;
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. */
fprintf (file, "graph: { title: \"%s\"\n", funcname);
@@ -4062,7 +4062,7 @@ dump_function_to_file (tree fn, FILE *file, int flags)
basic_block bb;
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);
while (arg)
diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c
index e94640eee00..f3fa63aa6d8 100644
--- a/gcc/tree-dfa.c
+++ b/gcc/tree-dfa.c
@@ -605,7 +605,7 @@ dump_immediate_uses (FILE *file)
basic_block bb;
block_stmt_iterator si;
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);
@@ -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_3 = "%-43s%11lu%c\n";
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);
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index cf50b9b18c2..f234651c7a0 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -394,7 +394,7 @@ remap_block (tree *block, inline_data *id)
/* 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);
+ lang_hooks.decls.insert_block (new_block);
else
{
/* Attach this new block after the DECL_INITIAL block for the
@@ -1930,7 +1930,7 @@ save_body (tree fn, tree *arg_copy)
for (parg = arg_copy; *parg; parg = &TREE_CHAIN (*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);
insert_decl_map (&id, *parg, new);
TREE_CHAIN (new) = TREE_CHAIN (*parg);
@@ -2017,8 +2017,8 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, void *htab_)
return NULL_TREE;
}
- result = (*lang_hooks.tree_inlining.walk_subtrees) (tp, &walk_subtrees, func,
- data, htab);
+ result = lang_hooks.tree_inlining.walk_subtrees (tp, &walk_subtrees, func,
+ data, htab);
if (result || ! walk_subtrees)
return result;
@@ -2056,7 +2056,7 @@ walk_tree (tree *tp, walk_tree_fn func, void *data, void *htab_)
}
#endif
- if ((*lang_hooks.tree_inlining.tree_chain_matters_p) (*tp))
+ if (lang_hooks.tree_inlining.tree_chain_matters_p (*tp))
/* Check our siblings. */
WALK_SUBTREE_TAIL (TREE_CHAIN (*tp));
}
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index a569d0536b1..368ffdf82c0 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -570,7 +570,7 @@ dump_tree_ssa (FILE *file)
{
basic_block bb;
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);
diff --git a/gcc/tree-mudflap.c b/gcc/tree-mudflap.c
index 474c7c45546..1d4acc8b020 100644
--- a/gcc/tree-mudflap.c
+++ b/gcc/tree-mudflap.c
@@ -344,7 +344,7 @@ mf_varname_tree (tree decl)
{
const char *funcname = NULL;
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)
funcname = "anonymous fn";
@@ -369,7 +369,7 @@ mf_varname_tree (tree decl)
}
if (declname == NULL)
- declname = (*lang_hooks.decl_printable_name) (decl, 3);
+ declname = lang_hooks.decl_printable_name (decl, 3);
if (declname == NULL)
declname = "<unnamed variable>";
@@ -415,7 +415,7 @@ mf_file_function_line_tree (location_t *locus)
colon = line = "";
/* Add (FUNCTION). */
- name = (*lang_hooks.decl_printable_name) (current_function_decl, 1);
+ name = lang_hooks.decl_printable_name (current_function_decl, 1);
if (name)
{
op = " (";
diff --git a/gcc/tree-optimize.c b/gcc/tree-optimize.c
index 80a2b41b6a1..ee03a98f1d6 100644
--- a/gcc/tree-optimize.c
+++ b/gcc/tree-optimize.c
@@ -386,7 +386,7 @@ execute_one_pass (struct tree_opt_pass *pass)
if (dump_file)
{
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
(DECL_ASSEMBLER_NAME (current_function_decl)));
fprintf (dump_file, "\n;; Function %s (%s)\n\n", dname, aname);
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index 7eea529f063..e4c6b07b70e 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -52,8 +52,8 @@ static void dump_generic_bb_buff (pretty_printer *, basic_block, int, int);
#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))
+ 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))
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 2bcb4efec9b..f7afc6f2a8a 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -1919,7 +1919,7 @@ static void
dump_alias_stats (FILE *file)
{
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, "Total alias queries:\t%u\n", alias_stats.alias_queries);
fprintf (file, "Total alias mayalias results:\t%u\n",
@@ -1948,7 +1948,7 @@ dump_alias_info (FILE *file)
{
size_t i;
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);
@@ -2031,7 +2031,7 @@ dump_points_to_info (FILE *file)
block_stmt_iterator si;
size_t i;
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);