diff options
Diffstat (limited to 'gcc/gimplify.c')
-rw-r--r-- | gcc/gimplify.c | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 5510f6008db..dd3d5fa5aba 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -2135,7 +2135,27 @@ gimplify_call_expr (tree *expr_p, tree *pre_p, bool want_value) /* Verify if the type of the argument matches that of the function declaration. If we cannot verify this or there is a mismatch, mark the call expression so it doesn't get inlined later. */ - if (parms) + if (decl && DECL_ARGUMENTS (decl)) + { + for (i = 0, p = DECL_ARGUMENTS (decl); i < nargs; + i++, p = TREE_CHAIN (p)) + { + /* We cannot distinguish a varargs function from the case + of excess parameters, still defering the inlining decision + to the callee is possible. */ + if (!p) + break; + if (p == error_mark_node + || CALL_EXPR_ARG (*expr_p, i) == error_mark_node + || !fold_convertible_p (DECL_ARG_TYPE (p), + CALL_EXPR_ARG (*expr_p, i))) + { + CALL_CANNOT_INLINE_P (*expr_p) = 1; + break; + } + } + } + else if (parms) { for (i = 0, p = parms; i < nargs; i++, p = TREE_CHAIN (p)) { @@ -2154,19 +2174,6 @@ gimplify_call_expr (tree *expr_p, tree *pre_p, bool want_value) } } } - else if (decl && DECL_ARGUMENTS (decl)) - { - for (i = 0, p = DECL_ARGUMENTS (decl); i < nargs; - i++, p = TREE_CHAIN (p)) - if (!p - || p == error_mark_node - || CALL_EXPR_ARG (*expr_p, i) == error_mark_node - || !fold_convertible_p (TREE_TYPE (p), CALL_EXPR_ARG (*expr_p, i))) - { - CALL_CANNOT_INLINE_P (*expr_p) = 1; - break; - } - } else if (nargs != 0) CALL_CANNOT_INLINE_P (*expr_p) = 1; |