diff options
| -rw-r--r-- | gcc/gimple-fold.cc | 10 | ||||
| -rw-r--r-- | gcc/gimplify.cc | 19 | ||||
| -rw-r--r-- | gcc/tree.cc | 2 |
3 files changed, 12 insertions, 19 deletions
diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc index 9e0c01d..d9b1a44 100644 --- a/gcc/gimple-fold.cc +++ b/gcc/gimple-fold.cc @@ -4876,13 +4876,13 @@ static bool gimple_fold_builtin_clear_padding (gimple_stmt_iterator *gsi) { gimple *stmt = gsi_stmt (*gsi); - gcc_assert (gimple_call_num_args (stmt) == 3); + gcc_assert (gimple_call_num_args (stmt) == 2); tree ptr = gimple_call_arg (stmt, 0); tree typearg = gimple_call_arg (stmt, 1); - /* the 3rd argument of __builtin_clear_padding is to distinguish whether - this call is made by the user or by the compiler for automatic variable - initialization. */ - bool for_auto_init = (bool) TREE_INT_CST_LOW (gimple_call_arg (stmt, 2)); + /* The 2nd argument of __builtin_clear_padding's value is used to + distinguish whether this call is made by the user or by the compiler + for automatic variable initialization. */ + bool for_auto_init = (bool) TREE_INT_CST_LOW (typearg); tree type = TREE_TYPE (TREE_TYPE (typearg)); location_t loc = gimple_location (stmt); clear_padding_struct buf; diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index 8d676fb..7d8850e 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -1804,7 +1804,6 @@ gimple_add_padding_init_for_auto_var (tree decl, bool is_vla, gimple_seq *seq_p) { tree addr_of_decl = NULL_TREE; - bool for_auto_init = true; tree fn = builtin_decl_explicit (BUILT_IN_CLEAR_PADDING); if (is_vla) @@ -1821,11 +1820,8 @@ gimple_add_padding_init_for_auto_var (tree decl, bool is_vla, addr_of_decl = build_fold_addr_expr (decl); } - gimple *call = gimple_build_call (fn, - 3, addr_of_decl, - build_zero_cst (TREE_TYPE (addr_of_decl)), - build_int_cst (integer_type_node, - (int) for_auto_init)); + gimple *call = gimple_build_call (fn, 2, addr_of_decl, + build_one_cst (TREE_TYPE (addr_of_decl))); gimplify_seq_add_stmt (seq_p, call); } @@ -3536,15 +3532,12 @@ gimplify_call_expr (tree *expr_p, gimple_seq *pre_p, bool want_value) { /* Remember the original type of the argument in an internal dummy second argument, as in GIMPLE pointer conversions are - useless. also mark this call as not for automatic initialization - in the internal dummy third argument. */ + useless. Also mark this call as not for automatic + initialization in the internal dummy third argument. */ p = CALL_EXPR_ARG (*expr_p, 0); - bool for_auto_init = false; *expr_p - = build_call_expr_loc (EXPR_LOCATION (*expr_p), fndecl, 3, p, - build_zero_cst (TREE_TYPE (p)), - build_int_cst (integer_type_node, - (int) for_auto_init)); + = build_call_expr_loc (EXPR_LOCATION (*expr_p), fndecl, 2, p, + build_zero_cst (TREE_TYPE (p))); return GS_OK; } break; diff --git a/gcc/tree.cc b/gcc/tree.cc index aeb3b4c..dd919ff 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -9520,7 +9520,7 @@ build_common_builtin_nodes (void) local_define_builtin ("__builtin_clear_padding", ftype, BUILT_IN_CLEAR_PADDING, "__builtin_clear_padding", - ECF_LEAF | ECF_NOTHROW); + ECF_LEAF | ECF_NOTHROW); } if (!builtin_decl_explicit_p (BUILT_IN_UNREACHABLE) |