Re: [PATCH] Trivial typo fix in variadic
On Sun, Sep 17, 2023 at 9:47 PM Marc Poulhiès via Gcc-patches wrote: > > Fix all occurences of varadic, except for Rust (will be part of another > change). OK. > gcc/ChangeLog: > > * config/nvptx/nvptx.h (struct machine_function): Fix typo in > variadic. > * config/nvptx/nvptx.cc (nvptx_function_arg_advance): Adjust to use > fixed name. > (nvptx_declare_function_name): Likewise. > (nvptx_call_args): Likewise. > (nvptx_expand_call): Likewise. > > gcc/cp/ChangeLog: > > * lambda.cc (compare_lambda_sig): Fix typo in variadic. > > libcpp/ChangeLog: > > * macro.cc (parse_params): Fix typo in variadic. > (create_iso_definition): Likewise. > > Signed-off-by: Marc Poulhiès > --- > > Hi, > > I came across this trivial typo and fixed it. > > The compiler still builds correctly. > I've bootstraped x86_64-linux. > As I don't really know how to setup nvptx correctly (and not sure > this trivial fix warrants learning the full setup...), I've simply > built the compiler for nvptx-none. > > Ok for master? > > gcc/config/nvptx/nvptx.cc | 14 +++--- > gcc/config/nvptx/nvptx.h | 4 ++-- > gcc/cp/lambda.cc | 2 +- > libcpp/macro.cc | 20 ++-- > 4 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc > index edef39fb5e1..0de42408841 100644 > --- a/gcc/config/nvptx/nvptx.cc > +++ b/gcc/config/nvptx/nvptx.cc > @@ -720,7 +720,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 > @@ -1548,7 +1548,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); > > @@ -1558,7 +1558,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); > > @@ -1795,13 +1795,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++; > } > } > @@ -1871,7 +1871,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 129427e5654..666021283c2 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 a359bc6ee8d..34d0190a89b 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))) >
[PATCH] Trivial typo fix in variadic
Fix all occurences of varadic, except for Rust (will be part of another change). gcc/ChangeLog: * config/nvptx/nvptx.h (struct machine_function): Fix typo in variadic. * config/nvptx/nvptx.cc (nvptx_function_arg_advance): Adjust to use fixed name. (nvptx_declare_function_name): Likewise. (nvptx_call_args): Likewise. (nvptx_expand_call): Likewise. gcc/cp/ChangeLog: * lambda.cc (compare_lambda_sig): Fix typo in variadic. libcpp/ChangeLog: * macro.cc (parse_params): Fix typo in variadic. (create_iso_definition): Likewise. Signed-off-by: Marc Poulhiès --- Hi, I came across this trivial typo and fixed it. The compiler still builds correctly. I've bootstraped x86_64-linux. As I don't really know how to setup nvptx correctly (and not sure this trivial fix warrants learning the full setup...), I've simply built the compiler for nvptx-none. Ok for master? gcc/config/nvptx/nvptx.cc | 14 +++--- gcc/config/nvptx/nvptx.h | 4 ++-- gcc/cp/lambda.cc | 2 +- libcpp/macro.cc | 20 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc index edef39fb5e1..0de42408841 100644 --- a/gcc/config/nvptx/nvptx.cc +++ b/gcc/config/nvptx/nvptx.cc @@ -720,7 +720,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 @@ -1548,7 +1548,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); @@ -1558,7 +1558,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); @@ -1795,13 +1795,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++; } } @@ -1871,7 +1871,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 129427e5654..666021283c2 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 a359bc6ee8d..34d0190a89b 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; } diff --git a/libcpp/macro.cc b/libcpp/macro.cc index dada8fea835..4f229c1501c 100644 --- a/libcpp/macro.cc +++ b/libcpp/macro.cc @@ -3431,7 +3431,7 @@ _cpp_unsave_parameters (cpp_reader *pfile, unsigned n) */ static bool -parse_params (cpp_reader *pfile, unsigned *n_ptr, bool *varadic_ptr)