From fc5851fe3df132cc4cccb21f8b1cd8fbb577b38c Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Fri, 9 Oct 2015 12:18:40 +0000 Subject: [PATCH] [PR67766] reorder handling of parallels, concats and promoted values in return for gcc/ChangeLog PR middle-end/67766 * function.c (expand_function_end): Move return value promotion past the handling of PARALLELs and CONCATs. From-SVN: r228651 --- gcc/ChangeLog | 4 ++++ gcc/function.c | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e31c1800002..cba70ef5669 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2015-10-09 Alexandre Oliva + PR middle-end/67766 + * function.c (expand_function_end): Move return value + promotion past the handling of PARALLELs and CONCATs. + PR rtl-optimization/67828 * tree-ssa-loop-unswitch.c: Include tree-ssa.h. (tree_may_unswitch_on): Don't unswitch on expressions diff --git a/gcc/function.c b/gcc/function.c index e76ba2b31ce..d16d6d88818 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -5446,18 +5446,6 @@ expand_function_end (void) decl_rtl); shift_return_value (GET_MODE (decl_rtl), true, real_decl_rtl); } - /* If a named return value dumped decl_return to memory, then - we may need to re-do the PROMOTE_MODE signed/unsigned - extension. */ - else if (GET_MODE (real_decl_rtl) != GET_MODE (decl_rtl)) - { - int unsignedp = TYPE_UNSIGNED (TREE_TYPE (decl_result)); - promote_function_mode (TREE_TYPE (decl_result), - GET_MODE (decl_rtl), &unsignedp, - TREE_TYPE (current_function_decl), 1); - - convert_move (real_decl_rtl, decl_rtl, unsignedp); - } else if (GET_CODE (real_decl_rtl) == PARALLEL) { /* If expand_function_start has created a PARALLEL for decl_rtl, @@ -5488,6 +5476,18 @@ expand_function_end (void) emit_move_insn (tmp, decl_rtl); emit_move_insn (real_decl_rtl, tmp); } + /* If a named return value dumped decl_return to memory, then + we may need to re-do the PROMOTE_MODE signed/unsigned + extension. */ + else if (GET_MODE (real_decl_rtl) != GET_MODE (decl_rtl)) + { + int unsignedp = TYPE_UNSIGNED (TREE_TYPE (decl_result)); + promote_function_mode (TREE_TYPE (decl_result), + GET_MODE (decl_rtl), &unsignedp, + TREE_TYPE (current_function_decl), 1); + + convert_move (real_decl_rtl, decl_rtl, unsignedp); + } else emit_move_insn (real_decl_rtl, decl_rtl); } -- 2.30.2