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

function.c (stack_protect_epilogue): Use expand_call to expand targetm.stack_protect_fail. 

* function.c (stack_protect_epilogue): Use expand_call to expand
	targetm.stack_protect_fail.
	* stmt.c (expand_expr_stmt): Remove now-unused function.
	* tree.h (expand_expr_stmt): Remove prototype.
	* doc/tm.texi.in (TARGET_STACK_PROTECT_FAIL): Document that this
	hook must return a CALL_EXPR.
	* doc/tm.texi: Regenerate.

From-SVN: r189522
This commit is contained in:
Steven Bosscher 2012-07-16 11:47:59 +00:00
parent 468660d358
commit b3c144a3a7
5 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/doc/tm.texi
View File

@ -4993,7 +4993,7 @@ The default version of this hook creates a variable called
@end deftypefn
@deftypefn {Target Hook} tree TARGET_STACK_PROTECT_FAIL (void)
This hook returns a tree expression that alerts the runtime that the
This hook returns a @code{CALL_EXPR} that alerts the runtime that the
stack protect guard variable has been modified. This expression should
involve a call to a @code{noreturn} function.

2
gcc/doc/tm.texi.in
View File

@ -4934,7 +4934,7 @@ The default version of this hook creates a variable called
@end deftypefn
@hook TARGET_STACK_PROTECT_FAIL
This hook returns a tree expression that alerts the runtime that the
This hook returns a @code{CALL_EXPR} that alerts the runtime that the
stack protect guard variable has been modified. This expression should
involve a call to a @code{noreturn} function.

3
gcc/function.c
View File

@ -4660,7 +4660,8 @@ stack_protect_epilogue (void)
if (JUMP_P (tmp))
predict_insn_def (tmp, PRED_NORETURN, TAKEN);
expand_expr_stmt (targetm.stack_protect_fail ());
expand_call (targetm.stack_protect_fail (), NULL_RTX, /*ignore=*/true);
free_temp_slots ();
emit_label (label);
}

36
gcc/stmt.c
View File

@ -1399,42 +1399,6 @@ resolve_operand_name_1 (char *p, tree outputs, tree inputs, tree labels)
return p;
}
/* Generate RTL to evaluate the expression EXP. */
void
expand_expr_stmt (tree exp)
{
rtx value;
tree type;
value = expand_expr (exp, const0_rtx, VOIDmode, EXPAND_NORMAL);
type = TREE_TYPE (exp);
/* If all we do is reference a volatile value in memory,
copy it to a register to be sure it is actually touched. */
if (value && MEM_P (value) && TREE_THIS_VOLATILE (exp))
{
if (TYPE_MODE (type) == VOIDmode)
;
else if (TYPE_MODE (type) != BLKmode)
copy_to_reg (value);
else
{
rtx lab = gen_label_rtx ();
/* Compare the value with itself to reference it. */
emit_cmp_and_jump_insns (value, value, EQ,
expand_normal (TYPE_SIZE (type)),
BLKmode, 0, lab);
emit_label (lab);
}
}
/* Free any temporaries used to evaluate this expression. */
free_temp_slots ();
}
/* Generate RTL to return from the current function, with no value.
(That is, we do not do anything about returning any value.) */

1
gcc/tree.h
View File

@ -5229,7 +5229,6 @@ extern tree unshare_expr (tree);
/* In stmt.c */
extern void expand_expr_stmt (tree);
extern void expand_label (tree);
extern void expand_goto (tree);