From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 23 Apr 2010 15:18:24 +0000 (+0000)
Subject: 2010-04-23  Richard Guenther  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33d8f01921475f1c755c4d98b00e054c5765494d;p=thirdparty%2Fgcc.git

2010-04-23  Richard Guenther  <rguenther@suse.de>

	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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 45ff41d3ad66..586f1e6b6705 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-23  Richard Guenther  <rguenther@suse.de>
+
+	PR lto/43455
+	* tree-inline.c (tree_can_inline_p): Also check compatibility
+	of return types.
+
 2010-04-23  Martin Jambor  <mjambor@suse.cz>
 
 	PR tree-optimization/43846
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9dccbadd47e3..28b1201d2423 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-23  Richard Guenther  <rguenther@suse.de>
+
+	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  <mjambor@suse.cz>
 
 	PR tree-optimization/43846
diff --git a/gcc/testsuite/gcc.dg/lto/20100423-1_0.c b/gcc/testsuite/gcc.dg/lto/20100423-1_0.c
new file mode 100644
index 000000000000..58456d43b693
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/20100423-1_0.c
@@ -0,0 +1,11 @@
+/* { dg-lto-do run } */
+/* { dg-lto-options {{-O2 -flto}} } */
+
+struct bar {int x;};
+extern struct bar foo(void);
+int main()
+{
+  struct bar x=foo();
+  return 0;
+}
+
diff --git a/gcc/testsuite/gcc.dg/lto/20100423-1_1.c b/gcc/testsuite/gcc.dg/lto/20100423-1_1.c
new file mode 100644
index 000000000000..8b159d2cb6fd
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/20100423-1_1.c
@@ -0,0 +1,7 @@
+typedef struct{int x;} bar;
+bar foo (void)
+{
+  bar x;
+  return x;
+}
+
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 1d3008b23632..59661a7d5096 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);