backport: re PR c/47150 (ICE in gimplify_expr at gimplify.c)

	Backport from mainline
	2011-01-06  Jakub Jelinek  <jakub@redhat.com>

	PR c/47150
	* c-convert.c (convert): When converting a complex expression
	other than COMPLEX_EXPR to a different complex type, ensure
	c_save_expr is called instead of save_expr, unless in_late_binary_op.
	* c-typeck.c (convert_for_assignment): Set in_late_binary_op also
	when converting COMPLEX_TYPE.

	* gcc.c-torture/compile/pr47150.c: New test.

From-SVN: r168869

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 35c243e7a93404f32ac06b1b889bdbac04931168..5caac14b75f97f777dcb3fb801ed4f7634c9f499 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,15 @@
 2011-01-16  Jakub Jelinek  <jakub@redhat.com>
 
        Backport from mainline
+       2011-01-06  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/47150
+       * c-convert.c (convert): When converting a complex expression
+       other than COMPLEX_EXPR to a different complex type, ensure
+       c_save_expr is called instead of save_expr, unless in_late_binary_op.
+       * c-typeck.c (convert_for_assignment): Set in_late_binary_op also
+       when converting COMPLEX_TYPE.
+
        2010-12-21  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/46880

diff --git a/gcc/c-convert.c b/gcc/c-convert.c
index 09638d5b151cc45bb8930e78b2dd82e844b8da8c..f0437f935381a069abb9e2dd2a57efa1c5e3a44b 100644 (file)
--- a/gcc/c-convert.c
+++ b/gcc/c-convert.c
@@ -131,6 +131,32 @@ convert (tree type, tree expr)
       goto maybe_fold;
 
     case COMPLEX_TYPE:
+      /* If converting from COMPLEX_TYPE to a different COMPLEX_TYPE
+        and e is not COMPLEX_EXPR, convert_to_complex uses save_expr,
+        but for the C FE c_save_expr needs to be called instead.  */
+      if (TREE_CODE (TREE_TYPE (e)) == COMPLEX_TYPE)
+       {
+         tree subtype = TREE_TYPE (type);
+         tree elt_type = TREE_TYPE (TREE_TYPE (e));
+
+         if (TYPE_MAIN_VARIANT (elt_type) != TYPE_MAIN_VARIANT (subtype)
+             && TREE_CODE (e) != COMPLEX_EXPR)
+           {
+             if (in_late_binary_op)
+               e = save_expr (e);
+             else
+               e = c_save_expr (e);
+             ret
+               = fold_build2 (COMPLEX_EXPR, type,
+                              convert (subtype,
+                                       fold_build1 (REALPART_EXPR,
+                                                    elt_type, e)),
+                              convert (subtype,
+                                       fold_build1 (IMAGPART_EXPR,
+                                                    elt_type, e)));
+             goto maybe_fold;
+           }
+       }
       ret = convert_to_complex (type, e);
       goto maybe_fold;
 

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 56bad2c88ae5a1c1751a2091db5eb72c815b7398..92b0f618f0b93a84322a8532e3f735e89d576744 100644 (file)
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -5025,10 +5025,10 @@ convert_for_assignment (location_t location, tree type, tree rhs,
     {
       tree ret;
       bool save = in_late_binary_op;
-      if (codel == BOOLEAN_TYPE)
+      if (codel == BOOLEAN_TYPE || codel == COMPLEX_TYPE)
        in_late_binary_op = true;
       ret = convert_and_check (type, orig_rhs);
-      if (codel == BOOLEAN_TYPE)
+      if (codel == BOOLEAN_TYPE || codel == COMPLEX_TYPE)
        in_late_binary_op = save;
       return ret;
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 63828d0f27ad7e79500e94ae9ba98953337ccf3a..648fa5d0f626b088ad78165d283e3a35d5c64d10 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2011-01-16  Jakub Jelinek  <jakub@redhat.com>
 
        Backport from mainline
+       2011-01-06  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/47150
+       * gcc.c-torture/compile/pr47150.c: New test.
+
        2010-12-21  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/46880

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr47150.c b/gcc/testsuite/gcc.c-torture/compile/pr47150.c
new file mode 100644 (file)
index 0000000..559ddd7
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr47150.c
@@ -0,0 +1,11 @@
+/* PR c/47150 */
+
+float _Complex foo (float, float);
+
+void
+bar ()
+{
+  float w = 2;
+  float _Complex b;
+  b = 0.5 * (foo (0, w) + foo (1, w) / w);
+}