re PR tree-optimization/79908 (ICE in gimplify_expr (gimplify.c:12155) gimplification...

[gcc]

2017-03-21  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
            Richard Biener  <rguenth@suse.com>

	PR tree-optimization/79908
	* tree-stdarg.c (expand_ifn_va_arg_1): For a VA_ARG whose LHS has
	been cast away, use force_gimple_operand to construct the side
	effects.

[gcc/testsuite]

2017-03-21  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
            Richard Biener  <rguenther@suse.de>

	PR tree-optimization/79908
	* gcc.dg/torture/pr79908.c: New file.

Co-Authored-By: Richard Biener <rguenth@suse.com>
Co-Authored-By: Richard Biener <rguenther@suse.de>
From-SVN: r246319

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5ce582b..81a27f9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-21  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
+            Richard Biener  <rguenth@suse.com>
+
+       PR tree-optimization/79908
+       * tree-stdarg.c (expand_ifn_va_arg_1): For a VA_ARG whose LHS has
+       been cast away, use force_gimple_operand to construct the side
+       effects.
+
 2017-03-21  Martin Liska  <mliska@suse.cz>
 
        PR libfortran/79956

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 086c6d3..c2be77a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-21  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
+            Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/79908
+       * gcc.dg/torture/pr79908.c: New file.
+
 2017-03-21  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
 
        * gcc.dg/tree-ssa/overflow-1.c: Use __UINT32_TYPE__ for targets

diff --git a/gcc/testsuite/gcc.dg/torture/pr79908.c b/gcc/testsuite/gcc.dg/torture/pr79908.c
new file mode 100644 (file)
index 0000000..e2d6920
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr79908.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+
+/* Used to fail in the stdarg pass before fix for PR79908.  */
+
+typedef __builtin_va_list __gnuc_va_list;
+typedef __gnuc_va_list va_list;
+
+void testva (int n, ...)
+{
+  va_list ap;
+  _Complex int i = __builtin_va_arg (ap, _Complex int);
+}

diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index 8972822..18dd972 100644 (file)
--- a/gcc/tree-stdarg.c
+++ b/gcc/tree-stdarg.c
@@ -33,6 +33,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "gimple-iterator.h"
 #include "gimple-walk.h"
 #include "gimplify.h"
+#include "gimplify-me.h"
 #include "tree-into-ssa.h"
 #include "tree-cfg.h"
 #include "tree-stdarg.h"
@@ -1058,12 +1059,16 @@ expand_ifn_va_arg_1 (function *fun)
            gimplify_assign (lhs, expr, &pre);
          }
        else
-         gimplify_expr (&expr, &pre, &post, is_gimple_lvalue, fb_lvalue);
+         {
+           gimple_seq tmp_seq;
+           force_gimple_operand (expr, &tmp_seq, false, NULL_TREE);
+           gimple_seq_add_seq_without_update (&pre, tmp_seq);
+         }
 
        input_location = saved_location;
        pop_gimplify_context (NULL);
 
-       gimple_seq_add_seq (&pre, post);
+       gimple_seq_add_seq_without_update (&pre, post);
        update_modified_stmts (pre);
 
        /* Add the sequence after IFN_VA_ARG.  This splits the bb right
@@ -1072,11 +1077,10 @@ expand_ifn_va_arg_1 (function *fun)
        gimple_find_sub_bbs (pre, &i);
 
        /* Remove the IFN_VA_ARG gimple_call.  It's the last stmt in the
-          bb.  */
+          bb if we added any stmts.  */
        unlink_stmt_vdef (stmt);
        release_ssa_name_fn (fun, gimple_vdef (stmt));
        gsi_remove (&i, true);
-       gcc_assert (gsi_end_p (i));
 
        /* We're walking here into the bbs which contain the expansion of
           IFN_VA_ARG, and will not contain another IFN_VA_ARG that needs