From 1d9fec7937f45dde5e04cac966a2d9a12f2fc15a Mon Sep 17 00:00:00 2001 From: Yiran Wang Date: Tue, 23 Jun 2015 15:33:17 -0700 Subject: Synchronize with google/gcc-4_9 to r224707 (from r214835) Change-Id: I3d6f06fc613c8f8b6a82143dc44b7338483aac5d --- gcc-4.9/gcc/combine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gcc-4.9/gcc/combine.c') diff --git a/gcc-4.9/gcc/combine.c b/gcc-4.9/gcc/combine.c index 7c0045205..adea2c161 100644 --- a/gcc-4.9/gcc/combine.c +++ b/gcc-4.9/gcc/combine.c @@ -1529,8 +1529,8 @@ setup_incoming_promotions (rtx first) uns3 = TYPE_UNSIGNED (DECL_ARG_TYPE (arg)); /* The mode and signedness of the argument as it is actually passed, - after any TARGET_PROMOTE_FUNCTION_ARGS-driven ABI promotions. */ - mode3 = promote_function_mode (DECL_ARG_TYPE (arg), mode2, &uns3, + see assign_parm_setup_reg in function.c. */ + mode3 = promote_function_mode (TREE_TYPE (arg), mode1, &uns3, TREE_TYPE (cfun->decl), 0); /* The mode of the register in which the argument is being passed. */ -- cgit v1.2.3