re PR rtl-optimization/40900 (redundant sign extend of short function returned value)

PR rtl-optimization/40900
	* expr.c (expand_expr_real_1) <SSA_NAME>: Fix long line.  Save the
	original expression for later reuse.
	<expand_decl_rtl>: Use promote_function_mode to compute the signedness
	of the promoted RTL for a SSA_NAME on the LHS of a call statement.

From-SVN: r161006
This commit is contained in:
Eric Botcazou 2010-06-18 16:38:29 +00:00
parent c88f5c4986
commit d36d83e9c0
4 changed files with 49 additions and 15 deletions

View file

@ -1,3 +1,11 @@
2010-06-18 Eric Botcazou <ebotcazou@adacore.com>
PR rtl-optimization/40900
* expr.c (expand_expr_real_1) <SSA_NAME>: Fix long line. Save the
original expression for later reuse.
<expand_decl_rtl>: Use promote_function_mode to compute the signedness
of the promoted RTL for a SSA_NAME on the LHS of a call statement.
2010-06-18 Anatoly Sokolov <aesok@post.ru>
* double-int.h (double_int_to_shwi, double_int_to_uhwi,

View file

@ -8301,6 +8301,8 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
location_t loc = EXPR_LOCATION (exp);
struct separate_ops ops;
tree treeop0, treeop1, treeop2;
tree ssa_name = NULL_TREE;
gimple g;
type = TREE_TYPE (exp);
mode = TYPE_MODE (type);
@ -8413,15 +8415,17 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
base variable. This unnecessarily allocates a pseudo, see how we can
reuse it, if partition base vars have it set already. */
if (!currently_expanding_to_rtl)
return expand_expr_real_1 (SSA_NAME_VAR (exp), target, tmode, modifier, NULL);
{
gimple g = get_gimple_for_ssa_name (exp);
if (g)
return expand_expr_real (gimple_assign_rhs_to_tree (g), target,
tmode, modifier, NULL);
}
decl_rtl = get_rtx_for_ssa_name (exp);
exp = SSA_NAME_VAR (exp);
return expand_expr_real_1 (SSA_NAME_VAR (exp), target, tmode, modifier,
NULL);
g = get_gimple_for_ssa_name (exp);
if (g)
return expand_expr_real (gimple_assign_rhs_to_tree (g), target, tmode,
modifier, NULL);
ssa_name = exp;
decl_rtl = get_rtx_for_ssa_name (ssa_name);
exp = SSA_NAME_VAR (ssa_name);
goto expand_decl_rtl;
case PARM_DECL:
@ -8523,15 +8527,21 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
/* If the mode of DECL_RTL does not match that of the decl, it
must be a promoted value. We return a SUBREG of the wanted mode,
but mark it so that we know that it was already extended. */
if (REG_P (decl_rtl)
&& GET_MODE (decl_rtl) != DECL_MODE (exp))
if (REG_P (decl_rtl) && GET_MODE (decl_rtl) != DECL_MODE (exp))
{
enum machine_mode pmode;
/* Get the signedness used for this variable. Ensure we get the
same mode we got when the variable was declared. */
pmode = promote_decl_mode (exp, &unsignedp);
/* Get the signedness to be used for this variable. Ensure we get
the same mode we got when the variable was declared. */
if (code == SSA_NAME
&& (g = SSA_NAME_DEF_STMT (ssa_name))
&& gimple_code (g) == GIMPLE_CALL)
pmode = promote_function_mode (type, mode, &unsignedp,
TREE_TYPE
(TREE_TYPE (gimple_call_fn (g))),
2);
else
pmode = promote_decl_mode (exp, &unsignedp);
gcc_assert (GET_MODE (decl_rtl) == pmode);
temp = gen_lowpart_SUBREG (mode, decl_rtl);

View file

@ -1,3 +1,7 @@
2010-06-18 Bernd Schmidt <bernds@codesourcery.com>
* gcc.target/arm/pr40900.c: New test.
2010-06-18 Arnaud Charlet <charlet@adacore.com>
* gnat.dg/class_wide2.adb: Remove bogus message, no longer generated.

View file

@ -0,0 +1,12 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fno-optimize-sibling-calls" } */
extern short shortv2();
short shortv1()
{
return shortv2();
}
/* { dg-final { scan-assembler-not "lsl" } } */
/* { dg-final { scan-assembler-not "asr" } } */
/* { dg-final { scan-assembler-not "sxth" } } */