Elide return during inlining when possible

Message ID nycvar.YFH.7.76.1911281323120.5566@zhemvz.fhfr.qr
State New
Headers show
Series
  • Elide return during inlining when possible
Related show

Commit Message

Richard Biener Nov. 28, 2019, 12:24 p.m.
Also from investigating the abstraction penalty in PR92645 I noticed
we create pointless stmts to copy the return value to the result decl
at the return.  That's not needed if the call doesn't have a LHS.

Bootstrapped and tested on x86_64-unknown-linux-gnu, applied to trunk.

Richard.

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

	PR tree-optimization/92645
	* tree-inline.c (remap_gimple_stmt): When the return value
	is not wanted, elide GIMPLE_RETURN.

	* gcc.dg/tree-ssa/inline-12.c: New testcase.

Patch

Index: gcc/tree-inline.c
===================================================================
--- gcc/tree-inline.c	(revision 278765)
+++ gcc/tree-inline.c	(working copy)
@@ -1541,9 +1541,12 @@  remap_gimple_stmt (gimple *stmt, copy_bo
 	 assignment to the equivalent of the original RESULT_DECL.
 	 If RETVAL is just the result decl, the result decl has
 	 already been set (e.g. a recent "foo (&result_decl, ...)");
-	 just toss the entire GIMPLE_RETURN.  */
+	 just toss the entire GIMPLE_RETURN.  Likewise for when the
+	 call doesn't want the return value.  */
       if (retval
 	  && (TREE_CODE (retval) != RESULT_DECL
+	      && (!id->call_stmt
+		  || gimple_call_lhs (id->call_stmt) != NULL_TREE)
 	      && (TREE_CODE (retval) != SSA_NAME
 		  || ! SSA_NAME_VAR (retval)
 		  || TREE_CODE (SSA_NAME_VAR (retval)) != RESULT_DECL)))
Index: gcc/testsuite/gcc.dg/tree-ssa/inline-12.c
===================================================================
--- gcc/testsuite/gcc.dg/tree-ssa/inline-12.c	(nonexistent)
+++ gcc/testsuite/gcc.dg/tree-ssa/inline-12.c	(working copy)
@@ -0,0 +1,22 @@ 
+/* { dg-do compile } */
+/* { dg-options "-O -fdump-tree-einline" } */
+
+void *foo (void *, int);
+static inline void *mcp (void *src, int i)
+{
+  return foo (src, i);
+}
+void bar()
+{
+  int i;
+  mcp (&i, 0);
+}
+
+/* There should be exactly two assignments, one for both
+   the original foo call and the inlined copy (plus a clobber
+   that doesn't match here).  In particular bar should look like
+     <bb 2> :
+     _4 = foo (&i, 0);
+     i ={v} {CLOBBER};
+     return;  */
+/* { dg-final { scan-tree-dump-times " = " 2 "einline" } } */