re PR lto/88087 (ICE in execute at tree-ssa-pre.c:4220 since r266183)

2018-11-20  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/88087
	* tree-ssa-pre.c (create_expression_by_pieces): Re-materialize
	call fntype.
	* tree-ssa-sccvn.c (copy_reference_ops_from_call): Remember
	call fntype.

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

From-SVN: r266301

gcc/ChangeLog

 2018-11-20  Richard Biener  <rguenther@suse.de>
 
+	PR tree-optimization/88087
+	* tree-ssa-pre.c (create_expression_by_pieces): Re-materialize
+	call fntype.
+	* tree-ssa-sccvn.c (copy_reference_ops_from_call): Remember
+	call fntype.
+
+2018-11-20  Richard Biener  <rguenther@suse.de>
+
 	PR middle-end/88089
 	* tree-data-ref.c (lambda_matrix_right_hermite): Use abs_hwi.
 

gcc/testsuite/ChangeLog

+2018-11-20  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/88087
+	* gcc.dg/tree-ssa/pr88087.c: New testcase.
+
 2018-11-19  Paul Koning  <ni1d@arrl.net>
 
 	* gcc.c-torture/execute/align-3.c: Skip if pdp11.

gcc/testsuite/gcc.dg/tree-ssa/pr88087.c

+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-pre-stats" } */
+
+int f();
+int d;
+void c()
+{
+  for (;;)
+    {
+      f();
+      int (*fp)() __attribute__((const)) = (void *)f;
+      d = fp();
+    }
+}
+
+/* We shouldn't ICE and hoist the const call of fp out of the loop.  */
+/* { dg-final { scan-tree-dump "Eliminated: 1" "pre" } } */

gcc/tree-ssa-pre.c

@@ -2792,9 +2792,10 @@ create_expression_by_pieces (basic_block block, pre_expr expr,
 	      args.quick_push (arg);
 	    }
 	  gcall *call = gimple_build_call_vec (fn, args);
+	  gimple_call_set_fntype (call, currop->type);
 	  if (sc)
 	    gimple_call_set_chain (call, sc);
-	  tree forcedname = make_ssa_name (currop->type);
+	  tree forcedname = make_ssa_name (TREE_TYPE (currop->type));
 	  gimple_call_set_lhs (call, forcedname);
 	  /* There's no CCP pass after PRE which would re-compute alignment
 	     information so make sure we re-materialize this here.  */

gcc/tree-ssa-sccvn.c

@@ -1206,7 +1206,7 @@ copy_reference_ops_from_call (gcall *call,
 
   /* Copy the type, opcode, function, static chain and EH region, if any.  */
   memset (&temp, 0, sizeof (temp));
-  temp.type = gimple_call_return_type (call);
+  temp.type = gimple_call_fntype (call);
   temp.opcode = CALL_EXPR;
   temp.op0 = gimple_call_fn (call);
   temp.op1 = gimple_call_chain (call);