backport: re PR tree-optimization/83521 (ICE: verify_gimple failed (error: invalid...

	Backported from mainline
	2017-12-21  Jakub Jelinek  <jakub@redhat.com>

	PR tree-optimization/83521
	* tree-ssa-phiopt.c (factor_out_conditional_conversion): Use
	gimple_build_assign without code on result of
	fold_build1 (VIEW_CONVERT_EXPR, ...), as it might not create
	a VIEW_CONVERT_EXPR.

	* gcc.dg/pr83521.c: New test.

From-SVN: r262047

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 78463eccedcf595b68cde4b7c13bdf94ecc7dad0..d67b8dbebdcc4c618f0fb9d6c04230844246a7d2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,14 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2017-12-21  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/83521
+       * tree-ssa-phiopt.c (factor_out_conditional_conversion): Use
+       gimple_build_assign without code on result of
+       fold_build1 (VIEW_CONVERT_EXPR, ...), as it might not create
+       a VIEW_CONVERT_EXPR.
+
        2017-12-19  Jakub Jelinek  <jakub@redhat.com>
 
        PR ipa/82801

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 069c4e2103365fe56b6147703bfad563e11d48f6..dd21e51e93c90da19d514c09a5ac5ef28daec2ee 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2017-12-21  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/83521
+       * gcc.dg/pr83521.c: New test.
+
        2017-12-19  Jakub Jelinek  <jakub@redhat.com>
 
        PR ipa/82801

diff --git a/gcc/testsuite/gcc.dg/pr83521.c b/gcc/testsuite/gcc.dg/pr83521.c
new file mode 100644 (file)
index 0000000..fc7ca04
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr83521.c
@@ -0,0 +1,10 @@
+/* PR tree-optimization/83521 */
+/* { dg-do compile } */
+/* { dg-options "-O1 -fno-tree-forwprop" } */
+
+int
+foo (unsigned int x, int y)
+{
+  int *z = (int *)&x;
+  return (y == 0) ? y : *z;
+}

diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index fb6e8be434346bc0fb8e290d47ee3e506d5b2f6c..5f92ce5d25ad7721b5a437658b4cbd680977cc84 100644 (file)
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -523,8 +523,12 @@ factor_out_conditional_conversion (edge e0, edge e1, gphi *phi,
 
   /* Create the conversion stmt and insert it.  */
   if (convert_code == VIEW_CONVERT_EXPR)
-    temp = fold_build1 (VIEW_CONVERT_EXPR, TREE_TYPE (result), temp);
-  new_stmt = gimple_build_assign (result,  convert_code, temp);
+    {
+      temp = fold_build1 (VIEW_CONVERT_EXPR, TREE_TYPE (result), temp);
+      new_stmt = gimple_build_assign (result, temp);
+    }
+  else
+    new_stmt = gimple_build_assign (result, convert_code, temp);
   gsi = gsi_after_labels (gimple_bb (phi));
   gsi_insert_before (&gsi, new_stmt, GSI_SAME_STMT);