From 0ffe60b5058fa621288e1dbe12fb588d2c040e5e Mon Sep 17 00:00:00 2001 From: Bill Schmidt Date: Tue, 21 Mar 2017 13:57:20 +0000 Subject: [PATCH] re PR tree-optimization/79908 (ICE in gimplify_expr (gimplify.c:12155) gimplification failed) [gcc] 2017-03-21 Bill Schmidt Richard Biener 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 Richard Biener PR tree-optimization/79908 * gcc.dg/torture/pr79908.c: New file. Co-Authored-By: Richard Biener Co-Authored-By: Richard Biener From-SVN: r246319 --- gcc/ChangeLog | 8 ++++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.dg/torture/pr79908.c | 12 ++++++++++++ gcc/tree-stdarg.c | 12 ++++++++---- 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr79908.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5ce582bc527..81a27f9f051 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2017-03-21 Bill Schmidt + Richard Biener + + 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 PR libfortran/79956 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 086c6d34d65..c2be77a3b21 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2017-03-21 Bill Schmidt + Richard Biener + + PR tree-optimization/79908 + * gcc.dg/torture/pr79908.c: New file. + 2017-03-21 Senthil Kumar Selvaraj * 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 index 00000000000..e2d6920a4cd --- /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 8972822f5b7..18dd972e3f6 100644 --- 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 -- 2.30.2