This patch splits out another idiom from the va_arg gimplification routines, so that there's only one place to update later.
2019-08-19 Richard Sandiford <richard.sandif...@arm.com> gcc/ * calls.h (must_pass_va_arg_in_stack): Declare. * calls.c (must_pass_va_arg_in_stack): New function. * config/alpha/alpha.c (alpha_gimplify_va_arg_1): Use it. * config/sh/sh.c (sh_gimplify_va_arg_expr): Likewise. * config/stormy16/stormy16.c (xstormy16_gimplify_va_arg_expr): Likewise. * config/xtensa/xtensa.c (xtensa_gimplify_va_arg_expr): Likewise. Index: gcc/calls.h =================================================================== --- gcc/calls.h 2019-08-19 15:58:10.742205564 +0100 +++ gcc/calls.h 2019-08-19 15:58:16.094166837 +0100 @@ -28,6 +28,7 @@ extern bool gimple_alloca_call_p (const extern bool alloca_call_p (const_tree); extern bool must_pass_in_stack_var_size (machine_mode, const_tree); extern bool must_pass_in_stack_var_size_or_pad (machine_mode, const_tree); +extern bool must_pass_va_arg_in_stack (tree); extern rtx prepare_call_address (tree, rtx, rtx, rtx *, int, int); extern bool shift_return_value (machine_mode, bool, rtx); extern rtx expand_call (tree, rtx, int); Index: gcc/calls.c =================================================================== --- gcc/calls.c 2019-08-19 15:58:10.742205564 +0100 +++ gcc/calls.c 2019-08-19 15:58:16.094166837 +0100 @@ -5900,5 +5900,14 @@ must_pass_in_stack_var_size_or_pad (mach return false; } +/* Return true if TYPE must be passed on the stack when passed to + the "..." arguments of a function. */ + +bool +must_pass_va_arg_in_stack (tree type) +{ + return targetm.calls.must_pass_in_stack (TYPE_MODE (type), type); +} + /* Tell the garbage collector about GTY markers in this source file. */ #include "gt-calls.h" Index: gcc/config/alpha/alpha.c =================================================================== --- gcc/config/alpha/alpha.c 2019-08-19 15:58:10.750205506 +0100 +++ gcc/config/alpha/alpha.c 2019-08-19 15:58:16.094166837 +0100 @@ -6243,7 +6243,7 @@ alpha_gimplify_va_arg_1 (tree type, tree /* If the type could not be passed in registers, skip the block reserved for the registers. */ - if (targetm.calls.must_pass_in_stack (TYPE_MODE (type), type)) + if (must_pass_va_arg_in_stack (type)) { t = build_int_cst (TREE_TYPE (offset), 6*8); gimplify_assign (offset, Index: gcc/config/sh/sh.c =================================================================== --- gcc/config/sh/sh.c 2019-08-13 22:35:11.793251783 +0100 +++ gcc/config/sh/sh.c 2019-08-19 15:58:16.098166809 +0100 @@ -7656,9 +7656,8 @@ sh_gimplify_va_arg_expr (tree valist, tr tree addr, lab_over = NULL, result = NULL; tree eff_type; - const bool pass_by_ref = - !VOID_TYPE_P (type) - && targetm.calls.must_pass_in_stack (TYPE_MODE (type), type); + const bool pass_by_ref + = !VOID_TYPE_P (type) && must_pass_va_arg_in_stack (type); if (pass_by_ref) type = build_pointer_type (type); Index: gcc/config/stormy16/stormy16.c =================================================================== --- gcc/config/stormy16/stormy16.c 2019-08-13 22:35:11.805251695 +0100 +++ gcc/config/stormy16/stormy16.c 2019-08-19 15:58:16.098166809 +0100 @@ -1342,7 +1342,7 @@ xstormy16_gimplify_va_arg_expr (tree val count = build3 (COMPONENT_REF, TREE_TYPE (f_count), valist, f_count, NULL_TREE); - must_stack = targetm.calls.must_pass_in_stack (TYPE_MODE (type), type); + must_stack = must_pass_va_arg_in_stack (type); size_tree = round_up (size_in_bytes (type), UNITS_PER_WORD); gimplify_expr (&size_tree, pre_p, NULL, is_gimple_val, fb_rvalue); Index: gcc/config/xtensa/xtensa.c =================================================================== --- gcc/config/xtensa/xtensa.c 2019-08-19 15:58:10.766205389 +0100 +++ gcc/config/xtensa/xtensa.c 2019-08-19 15:58:16.098166809 +0100 @@ -3328,7 +3328,7 @@ xtensa_gimplify_va_arg_expr (tree valist array = create_tmp_var (ptr_type_node); lab_over = NULL; - if (!targetm.calls.must_pass_in_stack (TYPE_MODE (type), type)) + if (!must_pass_va_arg_in_stack (type)) { lab_false = create_artificial_label (UNKNOWN_LOCATION); lab_over = create_artificial_label (UNKNOWN_LOCATION);