diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config/nvptx/nvptx.cc | 14 | ||||
| -rw-r--r-- | gcc/config/nvptx/nvptx.h | 4 | ||||
| -rw-r--r-- | gcc/cp/lambda.cc | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc index 0eeff95..570bcc7 100644 --- a/gcc/config/nvptx/nvptx.cc +++ b/gcc/config/nvptx/nvptx.cc @@ -721,7 +721,7 @@ nvptx_function_arg_advance (cumulative_args_t cum_v, const function_arg_info &) /* Implement TARGET_FUNCTION_ARG_BOUNDARY. - For nvptx This is only used for varadic args. The type has already + For nvptx This is only used for variadic args. The type has already been promoted and/or converted to invisible reference. */ static unsigned @@ -1549,7 +1549,7 @@ nvptx_declare_function_name (FILE *file, const char *name, const_tree decl) if (!TARGET_SOFT_STACK) { /* Declare a local var for outgoing varargs. */ - if (cfun->machine->has_varadic) + if (cfun->machine->has_variadic) init_frame (file, STACK_POINTER_REGNUM, UNITS_PER_WORD, crtl->outgoing_args_size); @@ -1559,7 +1559,7 @@ nvptx_declare_function_name (FILE *file, const char *name, const_tree decl) init_frame (file, FRAME_POINTER_REGNUM, alignment, ROUND_UP (sz, GET_MODE_SIZE (DImode))); } - else if (need_frameptr || cfun->machine->has_varadic || cfun->calls_alloca + else if (need_frameptr || cfun->machine->has_variadic || cfun->calls_alloca || (cfun->machine->has_simtreg && !crtl->is_leaf)) init_softstack_frame (file, alignment, sz); @@ -1796,13 +1796,13 @@ nvptx_call_args (rtx arg, tree fntype) if (!cfun->machine->doing_call) { cfun->machine->doing_call = true; - cfun->machine->is_varadic = false; + cfun->machine->is_variadic = false; cfun->machine->num_args = 0; if (fntype && stdarg_p (fntype)) { - cfun->machine->is_varadic = true; - cfun->machine->has_varadic = true; + cfun->machine->is_variadic = true; + cfun->machine->has_variadic = true; cfun->machine->num_args++; } } @@ -1872,7 +1872,7 @@ nvptx_expand_call (rtx retval, rtx address) } unsigned nargs = cfun->machine->num_args; - if (cfun->machine->is_varadic) + if (cfun->machine->is_variadic) { varargs = gen_reg_rtx (Pmode); emit_move_insn (varargs, stack_pointer_rtx); diff --git a/gcc/config/nvptx/nvptx.h b/gcc/config/nvptx/nvptx.h index 407fd70..71cab66 100644 --- a/gcc/config/nvptx/nvptx.h +++ b/gcc/config/nvptx/nvptx.h @@ -209,8 +209,8 @@ struct GTY(()) machine_function { rtx_expr_list *call_args; /* Arg list for the current call. */ bool doing_call; /* Within a CALL_ARGS ... CALL_ARGS_END sequence. */ - bool is_varadic; /* This call is varadic */ - bool has_varadic; /* Current function has a varadic call. */ + bool is_variadic; /* This call is variadic */ + bool has_variadic; /* Current function has a variadic call. */ bool has_chain; /* Current function has outgoing static chain. */ bool has_softstack; /* Current function has a soft stack frame. */ bool has_simtreg; /* Current function has an OpenMP SIMD region. */ diff --git a/gcc/cp/lambda.cc b/gcc/cp/lambda.cc index a359bc6..34d0190 100644 --- a/gcc/cp/lambda.cc +++ b/gcc/cp/lambda.cc @@ -1619,7 +1619,7 @@ compare_lambda_sig (tree fn_a, tree fn_b) { if (!args_a || !args_b) return false; - // This check also deals with differing varadicness + // This check also deals with differing variadicness if (!same_type_p (TREE_VALUE (args_a), TREE_VALUE (args_b))) return false; } |