From da8160feb432efa1bf314f3f29bde7f035a8bdc5 Mon Sep 17 00:00:00 2001 From: rguenth Date: Fri, 23 Apr 2010 15:18:24 +0000 Subject: [PATCH] 2010-04-23 Richard Guenther PR lto/43455 * tree-inline.c (tree_can_inline_p): Also check compatibility of return types. * gcc.dg/lto/20100423-1_0.c: New testcase. * gcc.dg/lto/20100423-1_1.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158669 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/tree-inline.c | 12 ++++++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 45ff41d3ad6..586f1e6b670 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-04-23 Richard Guenther + + PR lto/43455 + * tree-inline.c (tree_can_inline_p): Also check compatibility + of return types. + 2010-04-23 Martin Jambor PR tree-optimization/43846 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9dccbadd47e..28b1201d242 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-04-23 Richard Guenther + + PR lto/43455 + * gcc.dg/lto/20100423-1_0.c: New testcase. + * gcc.dg/lto/20100423-1_1.c: Likewise. + 2010-04-23 Martin Jambor PR tree-optimization/43846 diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 1d3008b2363..59661a7d509 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -5082,7 +5082,7 @@ tree_can_inline_p (struct cgraph_edge *e) return false; } #endif - tree caller, callee; + tree caller, callee, lhs; caller = e->caller->decl; callee = e->callee->decl; @@ -5108,8 +5108,16 @@ tree_can_inline_p (struct cgraph_edge *e) return false; } + /* Do not inline calls where we cannot triviall work around mismatches + in argument or return types. */ if (e->call_stmt - && !gimple_check_call_args (e->call_stmt)) + && ((DECL_RESULT (callee) + && !DECL_BY_REFERENCE (DECL_RESULT (callee)) + && (lhs = gimple_call_lhs (e->call_stmt)) != NULL_TREE + && !useless_type_conversion_p (TREE_TYPE (DECL_RESULT (callee)), + TREE_TYPE (lhs)) + && !fold_convertible_p (TREE_TYPE (DECL_RESULT (callee)), lhs)) + || !gimple_check_call_args (e->call_stmt))) { e->inline_failed = CIF_MISMATCHED_ARGUMENTS; gimple_call_set_cannot_inline (e->call_stmt, true); -- 2.11.0