aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-stdarg.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/tree-stdarg.c')
-rw-r--r--gcc/tree-stdarg.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c
index 8972822..18dd972 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