From: Richard Biener <rguenther@suse.de>
Date: Fri, 16 Mar 2018 12:04:29 +0000 (+0000)
Subject: re PR c/84873 (ICE: verify_ssa failed (error: definition in block 3 does not dominate... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a1295eec4e21ad46774b829e2b54b04d8f0e5e35;p=gcc.git

re PR c/84873 (ICE: verify_ssa failed (error: definition in block 3 does not dominate use in block 4))

2018-03-16  Richard Biener  <rguenther@suse.de>

	PR c/84873
	* c-gimplify.c (c_gimplify_expr): Revert previous change.  Instead
	unshare the possibly folded expression.

From-SVN: r258591
---

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index a03ff86e57b..a54d44eb6f3 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-16  Richard Biener  <rguenther@suse.de>
+
+	PR c/84873
+	* c-gimplify.c (c_gimplify_expr): Revert previous change.  Instead
+	unshare the possibly folded expression.
+
 2018-03-15  Richard Biener  <rguenther@suse.de>
 
 	PR c/84873
diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
index e6b90ef95b6..faaf22e18a7 100644
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -245,15 +245,9 @@ c_gimplify_expr (tree *expr_p, gimple_seq *pre_p ATTRIBUTE_UNUSED,
 				    unsigned_type_node)
 	    && !types_compatible_p (TYPE_MAIN_VARIANT (TREE_TYPE (*op1_p)),
 				    integer_type_node))
-	  {
-	    /* ???  Do not use convert () here or fold arbitrary trees
-	       since folding can introduce tree sharing which is not
-	       allowed during gimplification.  */
-	    if (TREE_CODE (*op1_p) == INTEGER_CST)
-	      *op1_p = fold_convert (unsigned_type_node, *op1_p);
-	    else
-	      *op1_p = build1 (NOP_EXPR, unsigned_type_node, *op1_p);
-	  }
+	  /* Make sure to unshare the result, tree sharing is invalid
+	     during gimplification.  */
+	  *op1_p = unshare_expr (convert (unsigned_type_node, *op1_p));
 	break;
       }