From: Richard Biener <rguenther@suse.de>
Date: Fri, 8 Nov 2019 13:15:40 +0000 (+0000)
Subject: re PR ipa/92409 (r277920 causes ICE in gcc.dg/cast-function-1.c)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e7399b548c866ee2e408e0855b3be794c056fb1d;p=gcc.git

re PR ipa/92409 (r277920 causes ICE in gcc.dg/cast-function-1.c)

2019-11-08  Richard Biener  <rguenther@suse.de>

	PR ipa/92409
	* tree-inline.c (declare_return_variable): Properly handle
	type mismatches for the return slot.

From-SVN: r277972
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a2f30cf8aec..89bb2040880 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-08  Richard Biener  <rguenther@suse.de>
+
+	PR ipa/92409
+	* tree-inline.c (declare_return_variable): Properly handle
+	type mismatches for the return slot.
+
 2019-11-08  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR target/92095
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 9d0acd97f77..63274f74679 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -3593,7 +3593,9 @@ declare_return_variable (copy_body_data *id, tree return_slot, tree modify_dest,
      vs. the call expression.  */
   if (modify_dest)
     caller_type = TREE_TYPE (modify_dest);
-  else
+  else if (return_slot)
+    caller_type = TREE_TYPE (return_slot);
+  else /* No LHS on the call.  */
     caller_type = TREE_TYPE (TREE_TYPE (callee));
 
   /* We don't need to do anything for functions that don't return anything.  */
@@ -3634,6 +3636,10 @@ declare_return_variable (copy_body_data *id, tree return_slot, tree modify_dest,
 	  && !DECL_GIMPLE_REG_P (result)
 	  && DECL_P (var))
 	DECL_GIMPLE_REG_P (var) = 0;
+
+      if (!useless_type_conversion_p (callee_type, caller_type))
+	var = build1 (VIEW_CONVERT_EXPR, callee_type, var);
+
       use = NULL;
       goto done;
     }